diff --git a/README_zh.md b/README_zh.md index db65062b49b65cbd8cb2e6694fb0d4968b65741d..1dad47e3a89d0d2d9fb4ac35c3ccdc8346988082 100644 --- a/README_zh.md +++ b/README_zh.md @@ -62,7 +62,7 @@ API介绍请参考[《OpenHarmony Device开发API参考》](https://device.harmo - 为轻量系统开发三方应用 - 可参考[《轻量系统设备视觉应用开发》](https://docs.openharmony.cn/pages/v3.1/zh-cn/device-dev/guide/device-camera-visual-overview.md/)指南了解应用的开发细节。 + 可参考[《轻量系统设备视觉应用开发》](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/guide/device-camera-visual-overview.md/)指南了解应用的开发细节。 - 调试轻量JS-UI开发框架 diff --git a/ace_lite.gni b/ace_lite.gni index 903de88846899d056264a558a6a5672c47395856..971b7155ce0a1a4a188440d4978b2906d7e56c31 100644 --- a/ace_lite.gni +++ b/ace_lite.gni @@ -21,6 +21,56 @@ MODULE_MANAGER_PATH = "//foundation/arkui/ace_engine_lite/frameworks/module_manager" GRAPHIC_LITE_PATH = "//foundation/arkui/ui_lite" +ace_lite_common_defines = [] + +if (!defined(global_parts_info) || + defined(global_parts_info.graphic_surface_lite)) { + ace_engine_lite_surface_lite_enable = true + ace_lite_common_defines += [ "ace_engine_lite_surface_lite_enable" ] +} else { + ace_engine_lite_surface_lite_enable = false +} + +if (!defined(global_parts_info) || + defined(global_parts_info.communication_netstack)) { + ace_engine_lite_netstack_enable = true + ace_lite_common_defines += [ "ACE_ENGINE_LITE_NETSTACK_ENABLE" ] +} else { + ace_engine_lite_netstack_enable = false +} + +if (!defined(global_parts_info) || + defined(global_parts_info.powermgr_battery_lite)) { + ace_engine_lite_battery_lite_enable = true + ace_lite_common_defines += [ "ACE_ENGINE_LITE_BATTERY_LITE_ENABLE" ] +} else { + ace_engine_lite_battery_lite_enable = false +} + +if (!defined(global_parts_info) || + defined(global_parts_info.distributeddatamgr_kv_store)) { + ace_engine_lite_kv_store_enable = true + ace_lite_common_defines += [ "ACE_ENGINE_LITE_KV_STORE_ENABLE" ] +} else { + ace_engine_lite_kv_store_enable = false +} + +if (!defined(global_parts_info) || + defined(global_parts_info.multimedia_media_lite)) { + ace_engine_lite_media_lite_enable = true + ace_lite_common_defines += [ "ACE_ENGINE_LITE_MEDIA_LITE_ENABLE" ] +} else { + ace_engine_lite_media_lite_enable = false +} + +if (!defined(global_parts_info) || + defined(global_parts_info.multimedia_camera_lite)) { + ace_engine_lite_camera_lite_enable = true + ace_lite_common_defines += [ "ACE_ENGINE_LITE_CAMERA_LITE_ENABLE" ] +} else { + ace_engine_lite_camera_lite_enable = false +} + ace_lite_include_dirs = [ "$GRAPHIC_LITE_PATH/interfaces/kits/config", "$GRAPHIC_LITE_PATH/interfaces/kits/animator", diff --git a/bundle.json b/bundle.json index 70f89a58c3b98208a0e649ad6b5c001d52f7aba5..389eba0457717c922ce7a112b6312013017e25a7 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,9 @@ "syscap": [ "SystemCapability.ArkUI.ArkUI.Lite" ], - "feature": [], + "features": [ + "ace_engine_lite_feature_product_config" + ], "adapted_system_type": [ "mini","small" ], "rom": "521KB", "ram": "~82KB", diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index a8db5fe8258595a96fe259ed87517f22e9fb4d04..9416dd58bb87bb5a08786e705fac9b783cb38904 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -76,21 +76,7 @@ lite_library("ace_lite") { "//foundation/arkui/ui_lite:ui_lite", ] - defines = [ - "GRAPHIC_ENABLE_LINECAP_FLAG=1", - "GRAPHIC_ENABLE_LINEJOIN_FLAG=1", - "GRAPHIC_ENABLE_ELLIPSE_FLAG=1", - "GRAPHIC_ENABLE_BEZIER_ARC_FLAG=1", - "GRAPHIC_ENABLE_ARC_FLAG=1", - "GRAPHIC_ENABLE_ROUNDEDRECT_FLAG=1", - "GRAPHIC_ENABLE_DASH_GENERATE_FLAG=1", - "GRAPHIC_ENABLE_BLUR_EFFECT_FLAG=1", - "GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG=1", - "GRAPHIC_ENABLE_GRADIENT_FILL_FLAG=1", - "GRAPHIC_ENABLE_PATTERN_FILL_FLAG=1", - "GRAPHIC_ENABLE_DRAW_IMAGE_FLAG=1", - "GRAPHIC_ENABLE_DRAW_TEXT_FLAG=1", - ] + defines += ace_lite_common_defines if (ohos_kernel_type == "liteos_m") { deps += [ ":gen_syscap_module_native_mini" ] @@ -104,24 +90,52 @@ lite_library("ace_lite") { "//third_party/jerryscript:jerry_engine", ] } else { - if (enable_ohos_appexecfwk_feature_ability == true) { - defines += [ "ABILITY_WINDOW_SUPPORT" ] - defines += [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - } public_deps += [ "//base/startup/init/interfaces/innerkits/syscap:syscap", "//build/lite/config/component/cJSON:cjson_shared", - "//foundation/graphic/surface_lite:surface_lite", - "//foundation/multimedia/camera_lite/frameworks:camera_lite", - "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite", "//third_party/bounds_checking_function:libsec_shared", "//third_party/jerryscript/jerry-core:jerry-core_shared", "//third_party/jerryscript/jerry-ext:jerry-ext_shared", "//third_party/jerryscript/jerry-libm:jerry-libm_shared", "//third_party/jerryscript/jerry-port/default:jerry-port-default_shared", ] + + if (ace_engine_lite_surface_lite_enable) { + public_deps += [ "//foundation/graphic/surface_lite:surface_lite" ] + } + + if (ace_engine_lite_kv_store_enable) { + public_deps += [] + } + + if (ace_engine_lite_media_lite_enable) { + public_deps += [ + "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite", + ] + } + + if (ace_engine_lite_camera_lite_enable) { + public_deps += + [ "//foundation/multimedia/camera_lite/frameworks:camera_lite" ] + } } + defines += [ + "GRAPHIC_ENABLE_LINECAP_FLAG=1", + "GRAPHIC_ENABLE_LINEJOIN_FLAG=1", + "GRAPHIC_ENABLE_ELLIPSE_FLAG=1", + "GRAPHIC_ENABLE_BEZIER_ARC_FLAG=1", + "GRAPHIC_ENABLE_ARC_FLAG=1", + "GRAPHIC_ENABLE_ROUNDEDRECT_FLAG=1", + "GRAPHIC_ENABLE_DASH_GENERATE_FLAG=1", + "GRAPHIC_ENABLE_BLUR_EFFECT_FLAG=1", + "GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG=1", + "GRAPHIC_ENABLE_GRADIENT_FILL_FLAG=1", + "GRAPHIC_ENABLE_PATTERN_FILL_FLAG=1", + "GRAPHIC_ENABLE_DRAW_IMAGE_FLAG=1", + "GRAPHIC_ENABLE_DRAW_TEXT_FLAG=1", + ] + if (ohos_build_type == "debug") { defines += [ "JS_PROFILER=1" ] } else { @@ -132,7 +146,12 @@ lite_library("ace_lite") { defines += [ "JSFWK_TEST=1" ] } - if (enable_ohos_aafwk_multi_tasks_feature == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { + defines += [ "ABILITY_WINDOW_SUPPORT" ] + defines += [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] + } + + if (ability_lite_enable_ohos_aafwk_multi_tasks_feature == true) { defines += [ "_MINI_MULTI_TASKS_" ] } } diff --git a/frameworks/common/log/ace_log.cpp b/frameworks/common/log/ace_log.cpp index 919306926b052771dc726aece77c2c0a29fd1166..c56075cb483b52fbd3516ec606fc078cdeab79a2 100644 --- a/frameworks/common/log/ace_log.cpp +++ b/frameworks/common/log/ace_log.cpp @@ -16,6 +16,7 @@ #include "ace_log.h" #include #include +#include #if defined(TARGET_SIMULATOR) && (TARGET_SIMULATOR == 1) #include @@ -98,3 +99,42 @@ void HILOG_DEBUG(HiLogModuleType mod, const char *msg, ...) } // namespace ACELite } // namespace OHOS #endif // TARGET_SIMULATOR + +#if defined(FEATURE_ACELITE_MC_LOG_PRINTF) && (FEATURE_ACELITE_MC_LOG_PRINTF == 1) +void HILOG_CHARACTERS(const size_t size, const char* buffer) +{ + if (size == 0 || buffer == nullptr) { + return; + } + + const size_t len1 = 1; + const size_t len2 = 2; + const size_t len3 = 3; + const size_t len4 = 4; + const size_t len5 = 5; + const size_t chunkSize = 6; + + for (size_t index = 0; index < size; index += chunkSize) { + size_t len = std::min(size - index, chunkSize); + if (len == chunkSize) { + HILOG_ERROR(HILOG_MODULE_ACE, "%{public}c%{public}c%{public}c%{public}c%{public}c%{public}c", + buffer[index], buffer[index + len1], buffer[index + len2], + buffer[index + len3], buffer[index + len4], buffer[index + len5]); + } else if (len == len5) { + HILOG_ERROR(HILOG_MODULE_ACE, "%{public}c%{public}c%{public}c%{public}c%{public}c", + buffer[index], buffer[index + len1], buffer[index + len2], + buffer[index + len3], buffer[index + len4]); + } else if (len == len4) { + HILOG_ERROR(HILOG_MODULE_ACE, "%{public}c%{public}c%{public}c%{public}c", + buffer[index], buffer[index + len1], buffer[index + len2], buffer[index + len3]); + } else if (len == len3) { + HILOG_ERROR(HILOG_MODULE_ACE, "%{public}c%{public}c%{public}c", + buffer[index], buffer[index + len1], buffer[index + len2]); + } else if (len == len2) { + HILOG_ERROR(HILOG_MODULE_ACE, "%{public}c%{public}c", buffer[index], buffer[index + len1]); + } else if (len == len1) { + HILOG_ERROR(HILOG_MODULE_ACE, "%{public}c", buffer[index]); + } + } +} +#endif diff --git a/frameworks/common/log/ace_log.h b/frameworks/common/log/ace_log.h index 0aee2591bcdedc0955617243d51f0afe4b0408be..b25b1793056be79990fb8db96e414bdeb0d41256 100644 --- a/frameworks/common/log/ace_log.h +++ b/frameworks/common/log/ace_log.h @@ -17,6 +17,7 @@ #define OHOS_ACELITE_ACE_LOG_H #include "acelite_config.h" +#include #if ((defined(FEATURE_ACELITE_HI_LOG_PRINTF) && (FEATURE_ACELITE_HI_LOG_PRINTF == 1)) && \ (defined(FEATURE_ACELITE_MC_LOG_PRINTF) && (FEATURE_ACELITE_MC_LOG_PRINTF == 1))) @@ -59,6 +60,9 @@ #ifndef HILOG_RACE #define HILOG_RACE(mod, format, ...) #endif + +void HILOG_CHARACTERS(const size_t size, const char* buffer); + #elif defined(TARGET_SIMULATOR) && (TARGET_SIMULATOR == 1) namespace OHOS { namespace ACELite { diff --git a/frameworks/examples/airquality/src/main/js/default/app.js b/frameworks/examples/airquality/src/main/js/default/app.js index b99bb74e2ffd1cd6b02a07b94d5d29ddbe3ea0c2..229850fc085b83bd37c08775d07e86d2440e694e 100644 --- a/frameworks/examples/airquality/src/main/js/default/app.js +++ b/frameworks/examples/airquality/src/main/js/default/app.js @@ -19,4 +19,4 @@ export default { onDestroy() { console.info('AceApplication onDestroy'); } -} +}; diff --git a/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.js b/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.js index 077193c260a35f11fe811c5b86316b98a0397a0d..cf57507e5598127d742934237eb7bfe57cae9ced 100644 --- a/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.js +++ b/frameworks/examples/airquality/src/main/js/default/pages/detail/detail.js @@ -12,34 +12,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router"; +import router from '@system.router'; export default { data: { - location: "HangZhou", - updateStatus: "15:13", - dataSource: "tianqi.com", - updated: "Updated", - dataSourceName: "Data Source", + location: 'HangZhou', + updateStatus: '15:13', + dataSource: 'tianqi.com', + updated: 'Updated', + dataSourceName: 'Data Source', selectedIndex: 0, - airData: ["100", "90", "120", "50", "150", "40", "25"] + airData: ['100', '90', '120', '50', '150', '40', '25'] }, onInit() { this.location = this.$t(this.location); - this.updated = this.$t("updated"); - this.dataSourceName = this.$t("dataSourceName"); - this.sampledOn = this.$t("sampledOn"); - this.monitoringStation = this.$t("monitoringStation"); + this.updated = this.$t('updated'); + this.dataSourceName = this.$t('dataSourceName'); + this.sampledOn = this.$t('sampledOn'); + this.monitoringStation = this.$t('monitoringStation'); this.selectedIndex = this.selectedCityIndex; }, openHistory() { router.replace({ - uri: "pages/history/history" + uri: 'pages/history/history' }); }, backMain() { router.replace({ - uri: "pages/index/index", + uri: 'pages/index/index', params: { selectedCityIndex: this.selectedIndex } }); } diff --git a/frameworks/examples/airquality/src/main/js/default/pages/history/history.js b/frameworks/examples/airquality/src/main/js/default/pages/history/history.js index 46f247d28daf5adaf4c05804cdeea50dec058e49..7b78aa58892354712105f1c6392cbd3a971e2e2c 100644 --- a/frameworks/examples/airquality/src/main/js/default/pages/history/history.js +++ b/frameworks/examples/airquality/src/main/js/default/pages/history/history.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router"; +import router from '@system.router'; export default { data: { - historicalData: "historicalData", - datasets: ["CO", "PM2.5", "NO2", "NO", "PM10", "SO2"] + historicalData: 'historicalData', + datasets: ['CO', 'PM2.5', 'NO2', 'NO', 'PM10', 'SO2'] }, onInit() { this.historicalData = this.$t(this.historicalData); }, backDetail() { router.replace({ - uri: "pages/detail/detail" + uri: 'pages/detail/detail' }); } }; diff --git a/frameworks/examples/airquality/src/main/js/default/pages/index/index.js b/frameworks/examples/airquality/src/main/js/default/pages/index/index.js index 8b17f87c97fcae6df568289c85481d4edcb95451..782554baa0c261add17c1ec78e2456a21c20acaa 100644 --- a/frameworks/examples/airquality/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/airquality/src/main/js/default/pages/index/index.js @@ -12,28 +12,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router"; +import router from '@system.router'; export default { data: { - textColor1: "#00ff00", - textColor2: "#00ff00", - bgColor1: "#669966", - bgColor2: "#669966", + textColor1: '#00ff00', + textColor2: '#00ff00', + bgColor1: '#669966', + bgColor2: '#669966', swiperPage: 0, percent1: 0, percent2: 0, - src1: "common/cloud_green.png", - src2: "common/cloud_green.png", + src1: 'common/cloud_green.png', + src2: 'common/cloud_green.png', airData: [ { - location: "HangZhou", - airQuality: "Good", + location: 'HangZhou', + airQuality: 'Good', detailData: 10 }, { - location: "ShangHai", - airQuality: "Unhealth", + location: 'ShangHai', + airQuality: 'Unhealth', detailData: 90 } ] @@ -44,60 +44,60 @@ export default { this.airData[0].airQuality = this.$t(this.airData[0].airQuality); this.airData[1].airQuality = this.$t(this.airData[1].airQuality); if (this.airData[0].detailData > 100) { - this.src1 = "common/cloud_red.png"; - this.textColor1 = "#ff0000"; - this.bgColor1 = "#9d7462"; + this.src1 = 'common/cloud_red.png'; + this.textColor1 = '#ff0000'; + this.bgColor1 = '#9d7462'; } else if (50 < this.airData[0].detailData && this.airData[0].detailData <= 100) { - this.src1 = "common/cloud_yellow.png"; - this.textColor1 = "#ecf19a"; - this.bgColor1 = "#9d9d62"; + this.src1 = 'common/cloud_yellow.png'; + this.textColor1 = '#ecf19a'; + this.bgColor1 = '#9d9d62'; } if (this.airData[1].detailData > 100) { - this.src2 = "common/cloud_red.png"; - this.textColor2 = "#ff0000"; - this.bgColor2 = "#9d7462"; + this.src2 = 'common/cloud_red.png'; + this.textColor2 = '#ff0000'; + this.bgColor2 = '#9d7462'; } else if (50 < this.airData[1].detailData && this.airData[1].detailData <= 100) { - this.src2 = "common/cloud_yellow.png"; - this.textColor2 = "#ecf19a"; - this.bgColor2 = "#9d9d62"; + this.src2 = 'common/cloud_yellow.png'; + this.textColor2 = '#ecf19a'; + this.bgColor2 = '#9d9d62'; } if (this.selectedCityIndex) { this.swiperPage = this.selectedCityIndex; } }, onShow() { - var self = this; - var time = 1000 / self.airData[self.swiperPage].detailData; - if (time == 0) { + let self = this; + let time = 1000 / self.airData[self.swiperPage].detailData; + if (time === 0) { time = 100; } - var interval = setInterval(function () { - if ((self.swiperPage == 0 ? self.percent1 : self.percent2) >= self.airData[self.swiperPage].detailData) { + let interval = setInterval(function () { + if ((self.swiperPage === 0 ? self.percent1 : self.percent2) >= self.airData[self.swiperPage].detailData) { clearInterval(interval); return; } - self.swiperPage == 0 ? self.percent1++ : self.percent2++; + self.swiperPage === 0 ? self.percent1++ : self.percent2++; }, time); }, openDetail() { router.replace({ - uri: "pages/detail/detail", + uri: 'pages/detail/detail', params: { selectedCityIndex: this.swiperPage } }); }, swiperChange(e) { this.swiperPage = e.index; - var self = this; - var time = 1000 / self.airData[self.swiperPage].detailData; - if (time == 0) { + let self = this; + let time = 1000 / self.airData[self.swiperPage].detailData; + if (time === 0) { time = 100; } - var interval = setInterval(function () { - if ((self.swiperPage == 0 ? self.percent1 : self.percent2) >= self.airData[self.swiperPage].detailData) { + let interval = setInterval(function () { + if ((self.swiperPage === 0 ? self.percent1 : self.percent2) >= self.airData[self.swiperPage].detailData) { clearInterval(interval); return; } - self.swiperPage == 0 ? self.percent1++ : self.percent2++; + self.swiperPage === 0 ? self.percent1++ : self.percent2++; }, time); } }; diff --git a/frameworks/examples/alarm/src/main/js/default/app.js b/frameworks/examples/alarm/src/main/js/default/app.js index 3b91c573ab0b49501b79862a85da840ed9fabf52..9cdce286aa96e09e23406c540abfa4918faf8996 100644 --- a/frameworks/examples/alarm/src/main/js/default/app.js +++ b/frameworks/examples/alarm/src/main/js/default/app.js @@ -14,9 +14,9 @@ */ export default { onCreate() { - console.info("Application onCreate"); + console.info('Application onCreate'); }, onDestroy() { - console.info("Application onDestroy"); + console.info('Application onDestroy'); } }; diff --git a/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js b/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js index f6e7676f961b8327c271260f4b7da4bc712a9357..e1868656e69812a1b7cdd03ae5b0413a1a41a4ed 100644 --- a/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js +++ b/frameworks/examples/alarm/src/main/js/default/pages/editAlarm/edit_alarm.js @@ -12,56 +12,56 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router" +import router from '@system.router'; export default { data: { - selectedTime: "00:00", - targetHour: "00", - targetMinute: "00", + selectedTime: '00:00', + targetHour: '00', + targetMinute: '00', isSelectTimeChanged: false, - weekImgSrcOn: "common/ic_clock_btn_on.png", - weekImgSrcOff: "common/ic_clock_btn_off.png", + weekImgSrcOn: 'common/ic_clock_btn_on.png', + weekImgSrcOff: 'common/ic_clock_btn_off.png', weekOnList: [false, false, false, false, false, false, false], - weekImgSrcList: ["common/ic_clock_btn_off.png", "common/ic_clock_btn_off.png", - "common/ic_clock_btn_off.png", "common/ic_clock_btn_off.png", - "common/ic_clock_btn_off.png", "common/ic_clock_btn_off.png", "common/ic_clock_btn_off.png"], - weekList: ["日", "一", "二", "三", "四", "五", "六"], + weekImgSrcList: ['common/ic_clock_btn_off.png', 'common/ic_clock_btn_off.png', + 'common/ic_clock_btn_off.png', 'common/ic_clock_btn_off.png', + 'common/ic_clock_btn_off.png', 'common/ic_clock_btn_off.png', 'common/ic_clock_btn_off.png'], + weekList: ['日', '一', '二', '三', '四', '五', '六'], dataWrapper: { - mode: "", - time: "00:00", - repeat: "不重复", + mode: '', + time: '00:00', + repeat: '不重复', alarmItemIndex: -1 }, originData: [], isDebug: false, - buttonInfo: "删除闹钟", - repeatBeforeModify: "" + buttonInfo: '删除闹钟', + repeatBeforeModify: '' }, onInit() { if (this.isDebug) { - console.log("[editAlarm init] mode: " + this.dataWrapper.mode); - console.log("[editAlarm init] mode: " + this.dataWrapper.time); - console.log("[editAlarm init] mode: " + this.dataWrapper.repeat); - console.log("[editAlarm init] mode: " + this.dataWrapper.alarmItemIndex); - console.log("[weekSelector init] mode: " + this.dataWrapper.mode); - console.log("[weekSelector init] time: " + this.dataWrapper.time); - console.log("[weekSelector init] repeat: " + this.dataWrapper.repeat); - console.log("[weekSelector init] alarmItemIndex: " + this.dataWrapper.alarmItemIndex); + console.log('[editAlarm init] mode: ' + this.dataWrapper.mode); + console.log('[editAlarm init] mode: ' + this.dataWrapper.time); + console.log('[editAlarm init] mode: ' + this.dataWrapper.repeat); + console.log('[editAlarm init] mode: ' + this.dataWrapper.alarmItemIndex); + console.log('[weekSelector init] mode: ' + this.dataWrapper.mode); + console.log('[weekSelector init] time: ' + this.dataWrapper.time); + console.log('[weekSelector init] repeat: ' + this.dataWrapper.repeat); + console.log('[weekSelector init] alarmItemIndex: ' + this.dataWrapper.alarmItemIndex); } - if (this.dataWrapper.mode === "addAlarm") { - this.buttonInfo = "取消"; + if (this.dataWrapper.mode === 'addAlarm') { + this.buttonInfo = '取消'; } this.transforTimeToTwentyFourHour(this.dataWrapper.time); - if (this.dataWrapper.mode === "addAlarm") { - for (var i = 0; i < this.weekList.length; i++) { + if (this.dataWrapper.mode === 'addAlarm') { + for (let i = 0; i < this.weekList.length; i++) { this.weekOnList[i] = false; this.weekImgSrcList[i] = this.weekImgSrcOff; } } else { - for (var i = 0; i < this.weekList.length; i++) { + for (let i = 0; i < this.weekList.length; i++) { if (this.dataWrapper.repeat.indexOf(this.weekList[i]) !== -1) { this.weekOnList[i] = true; this.weekImgSrcList[i] = this.weekImgSrcOn; @@ -70,37 +70,37 @@ export default { } this.repeatBeforeModify = this.dataWrapper.repeat; - this.dataWrapper.repeat = ""; + this.dataWrapper.repeat = ''; - if (this.originData.toString() !== "undefined") { + if (this.originData.toString() !== 'undefined') { this.originData = this.originData; } }, transforTimeToTwentyFourHour(time) { - var timeArray = time.split(" "); - var timeDigital = timeArray[0]; - var timeAMPM = timeArray[1]; + let timeArray = time.split(' '); + let timeDigital = timeArray[0]; + let timeAMPM = timeArray[1]; - var hourTimeArray = timeDigital.split(":"); - var hour = hourTimeArray[0]; - var minute = hourTimeArray[1]; + let hourTimeArray = timeDigital.split(':'); + let hour = hourTimeArray[0]; + let minute = hourTimeArray[1]; - var onTheHour = 12; - if (timeAMPM === "下午") { - if (Number(hour) != onTheHour) { + let onTheHour = 12; + if (timeAMPM === '下午') { + if (Number(hour) !== onTheHour) { hour = Number(hour) + onTheHour; } - this.dataWrapper.time = hour + ":" + minute; + this.dataWrapper.time = hour + ':' + minute; } else { - if (Number(hour) == onTheHour) { - hour = "00"; + if (Number(hour) === onTheHour) { + hour = '00'; } - this.dataWrapper.time = hour + ":" + minute; + this.dataWrapper.time = hour + ':' + minute; } }, changeWeekSelected(index) { - this.weekOnList[index] = this.weekOnList[index] == false ? true : false; - this.weekImgSrcList[index] = this.weekOnList[index] == false ? this.weekImgSrcOff : this.weekImgSrcOn; + this.weekOnList[index] = this.weekOnList[index] === false ? true : false; + this.weekImgSrcList[index] = this.weekOnList[index] === false ? this.weekImgSrcOff : this.weekImgSrcOn; }, getSelectedTime(e) { this.targetHour = e.hour; @@ -109,21 +109,21 @@ export default { }, submit() { if (this.isSelectTimeChanged) { - this.targetHour = this.targetHour.toString().length === 1 ? "0" + this.targetHour : this.targetHour; - this.targetMinute = this.targetMinute.toString().length === 1 ? "0" + this.targetMinute : this.targetMinute; - this.dataWrapper.time = this.targetHour + ":" + this.targetMinute + " 上午"; + this.targetHour = this.targetHour.toString().length === 1 ? '0' + this.targetHour : this.targetHour; + this.targetMinute = this.targetMinute.toString().length === 1 ? '0' + this.targetMinute : this.targetMinute; + this.dataWrapper.time = this.targetHour + ':' + this.targetMinute + ' 上午'; } - if (this.weekOnList[0] == true) { + if (this.weekOnList[0] === true) { this.dataWrapper.repeat = this.weekList[0]; } - for (var index = 1; index < this.weekOnList.length; index++) { - if (this.weekOnList[index] == true) { - this.dataWrapper.repeat = this.dataWrapper.repeat + " " + this.weekList[index]; + for (let index = 1; index < this.weekOnList.length; index++) { + if (this.weekOnList[index] === true) { + this.dataWrapper.repeat = this.dataWrapper.repeat + ' ' + this.weekList[index]; } } - if (this.dataWrapper.repeat === "") { - this.dataWrapper.repeat = "不重复"; + if (this.dataWrapper.repeat === '') { + this.dataWrapper.repeat = '不重复'; } router.replace({ uri: 'pages/index/index', @@ -134,7 +134,7 @@ export default { }); }, remove() { - if (this.dataWrapper.mode === "editAlarm") { + if (this.dataWrapper.mode === 'editAlarm') { router.replace({ uri: 'pages/index/index', params: { @@ -143,7 +143,7 @@ export default { originData: this.originData } }); - } else if (this.dataWrapper.mode === "addAlarm") { + } else if (this.dataWrapper.mode === 'addAlarm') { router.replace({ uri: 'pages/index/index', params: { @@ -156,7 +156,7 @@ export default { }, back() { this.dataWrapper.repeat = this.repeatBeforeModify; - if (this.dataWrapper.mode === "addAlarm") { + if (this.dataWrapper.mode === 'addAlarm') { router.replace({ uri: 'pages/index/index', params: { @@ -175,4 +175,4 @@ export default { }); } } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/frameworks/examples/alarm/src/main/js/default/pages/index/index.js b/frameworks/examples/alarm/src/main/js/default/pages/index/index.js index 4c4198923816b6bbe11e516111f23e4f384f89a3..ba6ae526f6fe31d02bf4d0c6e6692c0e52689361 100644 --- a/frameworks/examples/alarm/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/alarm/src/main/js/default/pages/index/index.js @@ -12,27 +12,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router" -import app from '@system.app' +import router from '@system.router'; +import app from '@system.app'; export default { data: { - time: ["07:20 上午", "02:00 下午", "12:00 上午", "12:00 下午"], - repeat: ["一 二 三 四 五", "一 二 三 四 五", "日 一 二 三 四 五 六", "不重复"], - mode: ["addAlarm", "editAlarm", "deleteAlarm", "timeArrive"], + time: ['07:20 上午', '02:00 下午', '12:00 上午', '12:00 下午'], + repeat: ['一 二 三 四 五', '一 二 三 四 五', '日 一 二 三 四 五 六', '不重复'], + mode: ['addAlarm', 'editAlarm', 'deleteAlarm', 'timeArrive'], switchStatus: [false, false, false, false], - weeks: ["一", "二", "三", "四", "五", "六", "日"], + weeks: ['一', '二', '三', '四', '五', '六', '日'], dataWrapper: { - mode: "", - time: "00:00", - repeat: "不重复", + mode: '', + time: '00:00', + repeat: '不重复', alarmItemIndex: -1 }, originData: [], isDebug: false, - curTime: "", - curDay: "", - interValId: "" + curTime: '', + curDay: '', + interValId: '' }, packOriginData() { this.originData = [this.time, this.repeat, this.switchStatus]; @@ -40,32 +40,32 @@ export default { unPackOriginData() { this.time = this.originData[0]; this.repeat = this.originData[1]; - var switchStatusIndex = 2; + let switchStatusIndex = 2; this.switchStatus = this.originData[switchStatusIndex]; }, onInit() { - console.log("[mainPage init]"); + console.log('[mainPage init]'); this.startTimer(); if (this.originData.length === 0) { // app first start this.packOriginData(); } else { if (this.isDebug) { - console.log("[mainPage init] mode: " + this.dataWrapper.mode); - console.log("[mainPage init] mode: " + this.dataWrapper.time); - console.log("[mainPage init] mode: " + this.dataWrapper.repeat); - console.log("[mainPage init] mode: " + this.dataWrapper.alarmItemIndex); + console.log('[mainPage init] mode: ' + this.dataWrapper.mode); + console.log('[mainPage init] mode: ' + this.dataWrapper.time); + console.log('[mainPage init] mode: ' + this.dataWrapper.repeat); + console.log('[mainPage init] mode: ' + this.dataWrapper.alarmItemIndex); } this.unPackOriginData(); // apply origin data to current environment - var modeDeleteAlarmIndex = 3; - if (this.dataWrapper.mode === this.mode[0] && typeof (this.cancelAlarm) == "undefined") { // add alarm + let modeDeleteAlarmIndex = 3; + if (this.dataWrapper.mode === this.mode[0] && typeof (this.cancelAlarm) === 'undefined') { // add alarm this.time.push(this.transformTimeToTwelveHour(this.dataWrapper.time)); this.repeat.push(this.dataWrapper.repeat); this.switchStatus.push(false); } else if (this.dataWrapper.mode === this.mode[1]) { // edit alarm - if (typeof (this.deleteAlarm) != "undefined") { + if (typeof (this.deleteAlarm) !== 'undefined') { this.time.splice(this.dataWrapper.alarmItemIndex, 1); this.repeat.splice(this.dataWrapper.alarmItemIndex, 1); this.switchStatus.splice(this.dataWrapper.alarmItemIndex, 1); @@ -75,7 +75,7 @@ export default { this.switchStatus[this.dataWrapper.alarmItemIndex] = true; } } else if (this.dataWrapper.mode === this.mode[modeDeleteAlarmIndex]) { // time arrive - var switchValue = this.switchValue; + let switchValue = this.switchValue; this.switchStatus[this.dataWrapper.alarmItemIndex] = switchValue; } @@ -83,33 +83,33 @@ export default { } }, transformTimeToTwelveHour(time) { - var timeArray = time.split(" ")[0].split(":"); - var hour = timeArray[0]; - var minute = timeArray[1]; + let timeArray = time.split(' ')[0].split(':'); + let hour = timeArray[0]; + let minute = timeArray[1]; if (minute.length === 1) { - minute = "0" + minute; + minute = '0' + minute; } - var onTheHour = 12; - if (hour == "00") { + let onTheHour = 12; + if (hour === '00') { hour = onTheHour; - return hour + ":" + minute + " 上午"; + return hour + ':' + minute + ' 上午'; } - if (Number(hour) == onTheHour) { - return hour + ":" + minute + " 下午"; + if (Number(hour) === onTheHour) { + return hour + ':' + minute + ' 下午'; } if (Number(hour) > onTheHour) { hour = Number(hour) - onTheHour; - return hour + ":" + minute + " 下午"; + return hour + ':' + minute + ' 下午'; } else { - return hour + ":" + minute + " 上午"; + return hour + ':' + minute + ' 上午'; } }, addAlarm() { - var date = new Date(); - var strHour = date.getHours(); - var strMin = date.getMinutes(); + let date = new Date(); + let strHour = date.getHours(); + let strMin = date.getMinutes(); this.dataWrapper.mode = this.mode[0]; - this.dataWrapper.time = strHour + ":" + strMin; + this.dataWrapper.time = strHour + ':' + strMin; router.replace({ uri: 'pages/editAlarm/edit_alarm', params: { @@ -135,13 +135,13 @@ export default { }, switchChange(index, e) { if (e.checked) { - var modeDeleteAlarmIndex = 3; - var countDown = 2000; + let modeDeleteAlarmIndex = 3; + let countDown = 2000; this.dataWrapper.time = this.time[index]; this.dataWrapper.mode = this.mode[modeDeleteAlarmIndex]; this.dataWrapper.alarmItemIndex = index; - var dataWrapper = this.dataWrapper; - var oriData = this.originData; + let dataWrapper = this.dataWrapper; + let oriData = this.originData; setTimeout(function() { router.replace({ uri: 'pages/timeArrive/time_arrive', @@ -158,28 +158,28 @@ export default { app.terminate(); }, setCurTime() { - var date = new Date(); - var strHour = date.getHours() + ""; - var strMin = date.getMinutes() + ""; - var strSecond = date.getSeconds() + ""; - var strDay = date.getDay() + ""; - if (strHour.length == 1) { - strHour = "0" + strHour; + let date = new Date(); + let strHour = date.getHours() + ''; + let strMin = date.getMinutes() + ''; + let strSecond = date.getSeconds() + ''; + let strDay = date.getDay() + ''; + if (strHour.length === 1) { + strHour = '0' + strHour; } - if (strMin.length == 1) { - strMin = "0" + strMin; + if (strMin.length === 1) { + strMin = '0' + strMin; } - if (strSecond.length == 1) { - strSecond = "0" + strSecond; + if (strSecond.length === 1) { + strSecond = '0' + strSecond; } - this.curTime = strHour + " : " + strMin + " : " + strSecond; - this.curDay = "星期" + this.weeks[Number(strDay) - 1]; + this.curTime = strHour + ' : ' + strMin + ' : ' + strSecond; + this.curDay = '星期' + this.weeks[Number(strDay) - 1]; }, startTimer: function() { - var intervalTime = 1000; + let intervalTime = 1000; this.setCurTime(); this.interValId = setInterval(() => { this.setCurTime(); }, intervalTime); } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/frameworks/examples/alarm/src/main/js/default/pages/timeArrive/time_arrive.js b/frameworks/examples/alarm/src/main/js/default/pages/timeArrive/time_arrive.js index 3a9e15b3042e272516d841e126dbb3dcab7bf2f2..c363853aa46a57719cd4d52e7206471a02c7e15f 100644 --- a/frameworks/examples/alarm/src/main/js/default/pages/timeArrive/time_arrive.js +++ b/frameworks/examples/alarm/src/main/js/default/pages/timeArrive/time_arrive.js @@ -12,44 +12,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router" +import router from '@system.router'; export default { data: { - amOrPm: "", + amOrPm: '', dataWrapper: { - mode: "", - time: "00:00", - repeat: "不重复", + mode: '', + time: '00:00', + repeat: '不重复', alarmItemIndex: -1 }, originData: [], imageFrames: [ { - src: "/common/A016_017.png" + src: '/common/A016_017.png' }, { - src: "/common/A016_018.png" + src: '/common/A016_018.png' }, { - src: "/common/A016_019.png" + src: '/common/A016_019.png' }, { - src: "/common/A016_020.png" + src: '/common/A016_020.png' }, { - src: "/common/A016_021.png" + src: '/common/A016_021.png' }, ] }, onInit() { this.dataWrapper = this.dataWrapper; - if (this.originData.toString() !== "undefined") { + if (this.originData.toString() !== 'undefined') { this.originData = this.originData; } - var alarmTime = this.dataWrapper.time; - var alarmTimeArray = alarmTime.split(" "); + let alarmTime = this.dataWrapper.time; + let alarmTimeArray = alarmTime.split(' '); this.dataWrapper.time = alarmTimeArray[0]; this.amOrPm = alarmTimeArray[1]; }, @@ -73,4 +73,4 @@ export default { } }); } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/frameworks/examples/calculator/src/main/js/default/app.js b/frameworks/examples/calculator/src/main/js/default/app.js index 7524814af443401c7b3d2ed5f14be9b280c4b2f0..d85d58a6c348712e90df9f74a605b7f0f4d6753e 100644 --- a/frameworks/examples/calculator/src/main/js/default/app.js +++ b/frameworks/examples/calculator/src/main/js/default/app.js @@ -14,9 +14,9 @@ */ export default { onCreate() { - console.info("Application onCreate"); + console.info('Application onCreate'); }, onDestroy() { - console.info("Application onDestroy"); + console.info('Application onDestroy'); } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/calculator/src/main/js/default/common/calculator.js b/frameworks/examples/calculator/src/main/js/default/common/calculator.js index cca24204bc0b0f4d26e163810c5e01ca18dda718..2a750b8cf4a7d7ae2a966c2e04da1b6ff853ee4b 100644 --- a/frameworks/examples/calculator/src/main/js/default/common/calculator.js +++ b/frameworks/examples/calculator/src/main/js/default/common/calculator.js @@ -13,17 +13,17 @@ * limitations under the License. */ const OperatorLevels = { - "+": 0, - "-": 0, - "*": 1, - "/": 1, + '+': 0, + '-': 0, + '*': 1, + '/': 1, }; const OperatorHandlers = { - "+": (one, other) => one + other, - "-": (one, other) => one - other, - "*": (one, other) => one * other, - "/": (one, other) => one / other, + '+': (one, other) => one + other, + '-': (one, other) => one - other, + '*': (one, other) => one * other, + '/': (one, other) => one / other, }; function calcSuffixExpression(expression) { @@ -43,79 +43,65 @@ function calcSuffixExpression(expression) { return numberStack[0]; } -function toSuffixExpression(expression) { - const operatorStack = []; - const suffixExpression = []; - let topOperator; - for (let idx = 0, size = expression.length; idx < size; idx++) { - const element = expression[idx]; - if (element === "(") { - operatorStack.push(element); - continue; +function processElement(operatorStack, suffixExpression, element) { + if (element === '(') { + operatorStack.push(element); + } else if (element === ')') { + while (operatorStack.length && operatorStack[operatorStack.length - 1] !== '(') { + suffixExpression.push(operatorStack.pop()); } - if (element === ")") { - if (operatorStack.length) { - let operator = operatorStack.pop(); - while (operator !== "(") { - suffixExpression.push(operator); - operator = operatorStack.pop(); - } - } - continue; + if (operatorStack.length) { + operatorStack.pop(); } - if (isOperator(element)) { - if (!operatorStack.length) { - operatorStack.push(element); - } else { - topOperator = operatorStack[operatorStack.length - 1]; - if (!isGrouping(topOperator) && !isPrioritized(element, topOperator)) { - suffixExpression.push(operatorStack.pop()); - } - operatorStack.push(element); - } - continue; + } else if (isOperator(element)) { + let topOperator = operatorStack[operatorStack.length - 1]; + while (topOperator && !isGrouping(topOperator) && !isPrioritized(element, topOperator)) { + suffixExpression.push(operatorStack.pop()); + topOperator = operatorStack[operatorStack.length - 1]; } + operatorStack.push(element); + } else { suffixExpression.push(element); } +} + +function toSuffixExpression(expression) { + const operatorStack = []; + const suffixExpression = []; + + for (let idx = 0; idx < expression.length; idx++) { + processElement(operatorStack, suffixExpression, expression[idx]); + } + while (operatorStack.length) { suffixExpression.push(operatorStack.pop()); } + return suffixExpression; } function parseInfixExpression(content) { const size = content.length; - const lastIdx = size - 1; - let number = ""; + let number = ''; const expression = []; for (let idx = 0; idx < size; idx++) { const element = content[idx]; if (isGrouping(element)) { - if (number !== "") { - expression.push(number); - number = ""; - } + number && expression.push(number); number = ''; expression.push(element); } else if (isOperator(element)) { - if (isSymbol(element) && (idx === 0 || content[idx - 1] === "(")) { + if (isSymbol(element) && (idx === 0 || content[idx - 1] === '(')) { number += element; } else { - if (number !== "") { - expression.push(number); - number = ""; - } - - if (idx !== lastIdx) { - expression.push(element); - } + number && expression.push(number); number = ''; + + idx !== size - 1 && expression.push(element); } } else { number += element; } - if (idx === lastIdx && number !== "") { - expression.push(number); - } + idx === size - 1 && number && expression.push(number); } return expression; } @@ -126,20 +112,20 @@ function isPrioritized(one, other) { export function isOperator(operator) { return ( - operator === "+" || operator === "-" || operator === "*" || operator === "/" + operator === '+' || operator === '-' || operator === '*' || operator === '/' ); } function isSymbol(symbol) { - return symbol === "+" || symbol === "-"; + return symbol === '+' || symbol === '-'; } function isGrouping(operator) { - return operator === "(" || operator === ")"; + return operator === '(' || operator === ')'; } export function calc(content) { const infixExpression = parseInfixExpression(content); const suffixExpression = toSuffixExpression(infixExpression); return calcSuffixExpression(suffixExpression); -} +} \ No newline at end of file diff --git a/frameworks/examples/calculator/src/main/js/default/pages/index/index.js b/frameworks/examples/calculator/src/main/js/default/pages/index/index.js index 0d374ca68658f89dff91d7cfc2ccea2bb94bb66c..29ca7de45694d3a0ec4b712b47d47aa66bb9ef18 100644 --- a/frameworks/examples/calculator/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/calculator/src/main/js/default/pages/index/index.js @@ -34,33 +34,31 @@ export default { this.result = ''; }, handleInput(value) { - if (isOperator(value)) { - if (pressedEqual) { - pressedEqual = false; - } else { - const size = this.expression.length; - if (size) { - const last = this.expression.charAt(size - 1); - if (isOperator(last)) { - this.expression = this.expression.slice(0, -1); - } - } - } - if (!this.expression && (value == '*' || value == '/')) { - return; - } - this.expression += value; + const isOp = isOperator(value); + const isEmptyExpression = !this.expression; + + if (pressedEqual) { + this.expression = value; + pressedEqual = false; } else { - if (pressedEqual) { - this.expression = value; - pressedEqual = false; + if (isOp) { + // Remove the last operator if the current input is an operator + if (this.expression.length > 0 && + isOperator(this.expression.charAt(this.expression.length - 1))) { + this.expression = this.expression.slice(0, -1); + } + // Prevent leading division or multiplication + if (isEmptyExpression && (value === '*' || value === '/')) { + return; + } + this.expression += value; } else { this.expression += value; } } }, handleBackspace() { - if(pressedEqual) { + if (pressedEqual) { this.expression = ''; this.result = ''; pressedEqual = false; @@ -86,4 +84,4 @@ export default { handleExist() { app.terminate(); }, -} \ No newline at end of file +}; \ No newline at end of file diff --git a/frameworks/examples/music/src/main/js/default/app.js b/frameworks/examples/music/src/main/js/default/app.js index 0f8b3deda98a8daca4b806195e094adbcf4e74a0..01628b1bb35bfbded622e662031e37552f72a508 100644 --- a/frameworks/examples/music/src/main/js/default/app.js +++ b/frameworks/examples/music/src/main/js/default/app.js @@ -15,9 +15,9 @@ export default { onCreate() { - console.info("Application onCreate"); + console.info('Application onCreate'); }, onDestroy() { - console.info("Application onDestroy"); + console.info('Application onDestroy'); } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/music/src/main/js/default/pages/index/index.js b/frameworks/examples/music/src/main/js/default/pages/index/index.js index df8efb982eaf765ac2d5d644470858d4de8806e9..4661ddbc3a3c1a346d9edac3439ba39df68aa167 100644 --- a/frameworks/examples/music/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/music/src/main/js/default/pages/index/index.js @@ -13,67 +13,67 @@ * limitations under the License. */ -import audio from '@system.audio' -import file from '@system.file' -import app from '@system.app' +import audio from '@system.audio'; +import file from '@system.file'; +import app from '@system.app'; -var modeImages = ['common/ic_music_listorder.png', 'common/ic_music_listcycle.png', 'common/ic_music_shuffle.png', 'common/ic_music_singlecycle.png']; +let modeImages = ['common/ic_music_listorder.png', 'common/ic_music_listcycle.png', 'common/ic_music_shuffle.png', 'common/ic_music_singlecycle.png']; export default { data: { showMusicList: false, - playMode: 1, //0:sequential,1:list loop,2:random,3:single + playMode: 1, //0:sequential,1:list loop,2:random,3:single modeImage: 'common/ic_music_listcycle.png', playImage: 'common/ic_music_play.png', - playProgress: 0, //progress - curMusicIndex: 0, //music index - playStatus: 2, //0:play,1:pause,2:stop - curMusic: { //current music info - curMusicName: "", - singer: "", - playTime: "00:00", - allTime: "00:00" + playProgress: 0, //progress + curMusicIndex: 0, //music index + playStatus: 2, //0:play,1:pause,2:stop + curMusic: //current music info + curMusicName: '', + singer: '', + playTime: '00:00', + allTime: '00:00' }, musicList: [] }, onInit() { //get music duration audio.onplay = () => { - console.log("onplay start"); + console.log('onplay start'); this.curMusic.allTime = this.timeChange(audio.duration); this.playStatus = 0; }; //update play progress audio.ontimeupdate = () => { - if (audio.duration == null || audio.duration <= 0) { + if (audio.duration === null || audio.duration <= 0) { return; } - console.log("ontime update:"); + console.log('ontime update:'); this.curMusic.playTime = this.timeChange(audio.currentTime); - console.log("ontime update:" + this.curMusic.playTime); + console.log('ontime update:' + this.curMusic.playTime); this.playProgress = Math.floor(audio.currentTime * 100 / audio.duration); - console.log("ontime update progress:" + this.playProgress + ",duration:" + audio.duration); + console.log('ontime update progress:' + this.playProgress + ',duration:' + audio.duration); }; //play next song when meet an error audio.onerror = () => { - console.log("onerror"); + console.log('onerror'); this.changeSong(); }; //perform operations based on the playback mode. audio.onended = () => { - console.log("onend"); + console.log('onend'); this.playStatus = 2; //after played the last song in sequential mode ,stop playback - if (this.playMode == 0 && this.curMusicIndex == (this.musicList.length - 1)) { + if (this.playMode === 0 && this.curMusicIndex === (this.musicList.length - 1)) { this.playStatus = 2; - this.playImage = "common/ic_music_play.png"; - console.log("played the last song in sequential mode"); + this.playImage = 'common/ic_music_play.png'; + console.log('played the last song in sequential mode'); return; } - let mode = ""; - if (this.playMode == 2) { - console.log("random"); - mode = "random"; + let mode = ''; + if (this.playMode === 2) { + console.log('random'); + mode = 'random'; } this.changeSong(mode); }; @@ -83,46 +83,46 @@ export default { this.stopPlay(); }, clickListItem(index) { - console.log("listItemClick:start:" + index); - if (index == undefined || index == null) { + console.log('listItemClick:start:' + index); + if (index === undefined || index === null) { index = 0; } this.curMusicIndex = index; this.playStatus = 2; this.playMusic(); this.showMusicList = false; - console.log("listItemClick:end"); + console.log('listItemClick:end'); }, changeProgress(value) { - console.log("changeProgress start:" + value.progress); - if (value == null || value.progress == null) { + console.log('changeProgress start:' + value.progress); + if (value === null || value.progress === null) { return; } - if (this.playStatus == 2) { + if (this.playStatus === 2) { return; } let val = Math.floor((value.progress / 100) * audio.duration); - console.log("changeProgress change:" + val); + console.log('changeProgress change:' + val); audio.currentTime = val; - console.log("changeProgress end:"); + console.log('changeProgress end:'); }, playMusic() { - console.log("playMusic:start"); + console.log('playMusic:start'); //play music when is paused - this.playImage = "common/ic_music_pause.png"; - if (this.playStatus == 1) { + this.playImage = 'common/ic_music_pause.png'; + if (this.playStatus === 1) { audio.play(); this.playStatus = 0; - console.log("playMusic:play"); + console.log('playMusic:play'); return; - } else if (this.playStatus == 0) { - this.playImage = "common/ic_music_play.png"; + } else if (this.playStatus === 0) { + this.playImage = 'common/ic_music_play.png'; audio.pause(); this.playStatus = 1; - console.log("playMusic:pause"); + console.log('playMusic:pause'); return; } - if (this.curMusicIndex == null) { + if (this.curMusicIndex === null) { this.curMusicIndex = 0; } let music = this.musicList[this.curMusicIndex]; @@ -131,18 +131,18 @@ export default { this.curMusic.curMusicName = music.name; this.curMusic.singer = music.singer; audio.src = music.src; - console.log("playMusic:src:" + music.src); + console.log('playMusic:src:' + music.src); audio.play(); - if (this.playMode == 3) { + if (this.playMode === 3) { audio.loop = true; } else { audio.loop = false; } - console.log("playMusic:end"); + console.log('playMusic:end'); } }, stopPlay() { - console.log("stopPlay"); + console.log('stopPlay'); audio.src = null; audio.onstop = null; audio.onplay = null; @@ -150,96 +150,97 @@ export default { audio.onerror = null; }, changeMode() { - console.log("changeMode start"); - if (this.playMode == 3) { + console.log('changeMode start'); + if (this.playMode === 3) { this.playMode = 0; } else { this.playMode++; } - if (this.playMode == 3) { + if (this.playMode === 3) { audio.loop = true; } else { audio.loop = false; } - console.log("changeMode:" + this.playMode); + console.log('changeMode:' + this.playMode); this.modeImage = modeImages[this.playMode]; }, changeSong(mode) { - console.log("ChangeSong:start"); - if (this.playStatus == 0 || this.playStatus == 1) { + console.log('ChangeSong:start'); + if (this.playStatus === 0 || this.playStatus === 1) { this.playStatus = 2; } - if (this.playMode == 2) { - mode = "random"; + if (this.playMode === 2) { + mode = 'random'; } //previous - if (mode == "previous") { - this.curMusicIndex == 0 ? (this.curMusicIndex = (this.musicList.length - 1)) : this.curMusicIndex--; - console.log("ChangeSong:previous:" + this.curMusicIndex); - } else if (mode == "random") { //random + if (mode === 'previous') { + this.curMusicIndex === 0 ? (this.curMusicIndex = (this.musicList.length - 1)) : this.curMusicIndex--; + console.log('ChangeSong:previous:' + this.curMusicIndex); + } else if (mode === 'random') { //random this.curMusicIndex = parseInt(Math.random() * (this.musicList.length), 10); - console.log("ChangeSong:random:" + this.curMusicIndex); - } else { //next - (this.curMusicIndex == this.musicList.length - 1) ? this.curMusicIndex = 0 : this.curMusicIndex++; - console.log("ChangeSong:next" + this.curMusicIndex); + console.log('ChangeSong:random:' + this.curMusicIndex); + } else { //next + (this.curMusicIndex === this.musicList.length - 1) ? this.curMusicIndex = 0 : this.curMusicIndex++; + console.log('ChangeSong:next' + this.curMusicIndex); } this.curMusic.curMusicName = this.musicList[this.curMusicIndex].name; this.curMusic.singer = this.musicList[this.curMusicIndex].singer; this.playMusic(this.curMusicIndex); - if(this.showMusicList){ - this.$refs.musicList.scrollTo({ index: (this.curMusicIndex == 0?0:this.curMusicIndex-1) }); + if (this.showMusicList) { + this.$refs.musicList.scrollTo({ index : (this.curMusicIndex === 0 ? 0 : this.curMusicIndex - 1) }); } - console.log("ChangeSong:end"); + console.log('ChangeSong:end'); }, timeChange(seconds) { - console.log("timeChange:start:" + seconds); - if (seconds == null || seconds < 0) { - return "00:00"; + console.log('timeChange:start:' + seconds); + if (seconds === null || seconds < 0) { + return '00:00'; } - let minute, second = 0; + let minute = 0; + let second = 0; minute = Math.floor(seconds / 60); second = Math.floor(seconds % 60); - let result = (minute > 9 ? minute : "0" + minute) + ":" + (second > 9 ? second : "0" + second); - console.log("timeChange:end:" + result); + let result = (minute > 9 ? minute : '0' + minute) + ':' + (second > 9 ? second : '0' + second); + console.log('timeChange:end:' + result); return result; }, changePage(operation) { - console.log("changePage:start"); - if (operation != null && operation == "close") { + console.log('changePage:start'); + if (operation != null && operation === 'close') { this.showMusicList = false; return; } this.showMusicList = !this.showMusicList; - if(this.showMusicList){ - this.$refs.musicList.scrollTo({ index: (this.curMusicIndex == 0?0:this.curMusicIndex-1) }); + if (this.showMusicList) { + this.$refs.musicList.scrollTo({ index: (this.curMusicIndex === 0 ? 0 : this.curMusicIndex - 1) }); } }, - exitApp(){ - console.log("start exit"); + exitApp() { + console.log('start exit'); app.terminate(); - console.log("end exit"); + console.log('end exit'); }, - swipeEvent(e){ - if(e.direction == "right"){ - console.log("start exit"); + swipeEvent(e) { + if (e.direction === 'right') { + console.log('start exit'); this.exitApp(); } }, - getMusicList(){ + getMusicList() { let that = this; //get all music file file.readText({ - uri:"internal://app/musicList.txt", - success(data){ + uri:'internal://app/musicList.txt', + success(data) { console.log(data.text); let music = JSON.parse(data.text); - if(music != null){ + if (music != null) { that.musicList = music; } }, - fail(data,code){ - console.log("get music list failed :"+code); + fail(data, code) { + console.log('get music list failed :' + code); } }); } -} +}; diff --git a/frameworks/examples/showcase/src/main/js/default/app.js b/frameworks/examples/showcase/src/main/js/default/app.js index 1a48cb47eb3f938e82b70ba1a9bebcab5259b3f0..2e7095f7970178b500d8ffb8ad91fe2f283a2128 100644 --- a/frameworks/examples/showcase/src/main/js/default/app.js +++ b/frameworks/examples/showcase/src/main/js/default/app.js @@ -15,9 +15,9 @@ export default { onCreate() { - console.info("Application onCreate"); + console.info('Application onCreate'); }, onDestroy() { - console.info("Application onDestroy"); + console.info('Application onDestroy'); } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/chart.js b/frameworks/examples/showcase/src/main/js/default/common/js/chart.js index c72a62672348d1000a5507df3f337d70009b0fb8..84f9472e8f80a5232e07e83477860cabfa9a5b76 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/chart.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/chart.js @@ -16,29 +16,29 @@ export const dataCommon = { datasets: { barsets: [ { - fillColor: "#9c9c9c", + fillColor: '#9c9c9c', data: [2478, 2600, 3000, 3200, 3500, 3888, 4023, 4501, 4999, 5267] }, { - fillColor: "#3f9c3f", + fillColor: '#3f9c3f', data: [2000, 2, 800, 700, 433] }, { - fillColor: "#9c3f3f", + fillColor: '#9c3f3f', data: [100, 200, 300, 400, 500, 600, 550, 450, 350] } ], linesets: [ { - strokeColor: "#eeaaff", + strokeColor: '#eeaaff', data: [2478, 2600, 3000, 3200, 3500, 3888, 4023, 4501, 4999, 5267] }, { - strokeColor: "#ccddee", + strokeColor: '#ccddee', data: [2000, 2, 800, 700, 433] }, { - strokeColor: "#ddaacc", + strokeColor: '#ddaacc', data: [100, 200, 300, 400, 500, 600, 550, 450, 350] } ] @@ -71,16 +71,16 @@ export const dataCommon = { } }; export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; } }; export const changeDisplay = function() { - if (this.display === "flex") { - this.display = "none"; + if (this.display === 'flex') { + this.display = 'none'; } else { - this.display = "flex"; + this.display = 'flex'; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/general.js b/frameworks/examples/showcase/src/main/js/default/common/js/general.js index 22661f91c79cfd311796d0985fbd421d3647da7a..4e49ccb6834670b3eba7a0523bb3cb552f4f5992 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/general.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/general.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from "@system.router"; +import router from '@system.router'; export const backPage = function(superiorUri) { return { backMain() { - router.replace({ uri: "pages/index/index" }); + router.replace({ uri: 'pages/index/index' }); }, backSuperior() { router.replace({ uri: superiorUri }); @@ -26,7 +26,7 @@ export const backPage = function(superiorUri) { export const goPage = function(superiorUri) { return { goHome() { - router.replace({ uri: "pages/index/index" }); + router.replace({ uri: 'pages/index/index' }); }, goPrevious() { router.replace({ uri: superiorUri }); @@ -42,17 +42,18 @@ export const routePage = function(page) { }; export const eventCommon = function() { return { - text1: "点击事件未触发", - text2: "长按事件未触发", - text3: "swipe事件未触发", + text1: '点击事件未触发', + text2: '长按事件未触发', + text3: 'swipe事件未触发', clickFunc: function() { - this.text1 = "点击事件已触发"; + this.text1 = '点击事件已触发'; }, longpressFunc: function() { - this.text2 = "长按事件已触发"; + this.text2 = '长按事件已触发'; }, swipeFunc: function(e) { - this.text3 = "swipe方向：" + e.direction; + this.text3 = 'swipe方向:' + e.direction; } }; }; + diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/image.js b/frameworks/examples/showcase/src/main/js/default/common/js/image.js index 2060d13fa9043308e58d4050fdcb67da28c2323c..1f523c237c95df8eab21d1b34886648770cafaf5 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/image.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/image.js @@ -14,7 +14,7 @@ */ // image.js export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/input.js b/frameworks/examples/showcase/src/main/js/default/common/js/input.js index 45a3ac94449c356ee2d621422dc22803debc49f9..e05b69ab4b925f25a4473035c52566cc6597a665 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/input.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/input.js @@ -13,7 +13,7 @@ * limitations under the License. */ export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/list.js b/frameworks/examples/showcase/src/main/js/default/common/js/list.js index 77f9229057f6a0489e8a46b231ce39400680f6e9..3214942b5eafce62600e653e8b31dd0db2a830ee 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/list.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/list.js @@ -14,7 +14,7 @@ */ // list.js export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/marquee.js b/frameworks/examples/showcase/src/main/js/default/common/js/marquee.js index eb02a9a2e041e15febfc5802d11ed352dc0b5a58..cf24f2959134e5afc5b94e3df68c078046b13e6c 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/marquee.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/marquee.js @@ -13,14 +13,14 @@ * limitations under the License. */ export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; } }; export const changeIfStatus = function() { - if (this.ifstatus == true) { + if (this.ifstatus === true) { this.ifstatus = false; } else { this.ifstatus = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/picker_view.js b/frameworks/examples/showcase/src/main/js/default/common/js/picker_view.js index 5b211a48b4c07d2d08cadcd459e3aa92090b2c77..fc8e6add6d60faab546b7e308444921b63c8fa0f 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/picker_view.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/picker_view.js @@ -14,7 +14,7 @@ */ // picker_view.js export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/progress.js b/frameworks/examples/showcase/src/main/js/default/common/js/progress.js index 26994d74bc603fe7c9fef98c5b9ed9da1e7847e7..04f08ab187f510947f7bfc53bfc8b1bd7d432f7d 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/progress.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/progress.js @@ -13,34 +13,35 @@ * limitations under the License. */ export const changeStatusIf = function() { - if (this.ifStatus == true) { + if (this.ifStatus === true) { this.ifStatus = false; } else { this.ifStatus = true; } }; export const changeDisplay = function() { - if (this.display === "flex") { - this.display = "none"; + if (this.display === 'flex') { + this.display = 'none'; } else { - this.display = "flex"; + this.display = 'flex'; } }; export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; } }; export const clickEvent = function() { - this.value = "点击已触发"; + this.value = '点击已触发'; this.percent = this.percent + 10; }; export const longpressEvent = function() { - this.value = "长按已触发"; + this.value = '长按已触发'; this.percent = this.percent + 20; }; export const swipeEvent = function(e) { - this.value = "swipe方向：" + e.direction; + this.value = 'swipe方向：' + e.direction; }; + diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/stack.js b/frameworks/examples/showcase/src/main/js/default/common/js/stack.js index 179ef16fb4c03e4ba691a62c015a754a04978a5e..bde9242fc0cc6c157ccdaea5819a8f8bb0c4b30e 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/stack.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/stack.js @@ -14,7 +14,7 @@ */ // stack.js export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/swiper.js b/frameworks/examples/showcase/src/main/js/default/common/js/swiper.js index 722acfd4e0a97e2dd38f8d53fd83aa8e59008164..4e59d69872dfe0e8fe0b36cc85122e42591e2779 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/swiper.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/swiper.js @@ -16,7 +16,7 @@ export const showPage = function(e) { this.index = e.index; }; export const changeStatus = function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/common/js/text.js b/frameworks/examples/showcase/src/main/js/default/common/js/text.js index c0733b1bf20f4528ed90eb4819834d0520774775..52c01d488b9d1bd2ec4d1e63d72cb158f003dbd9 100644 --- a/frameworks/examples/showcase/src/main/js/default/common/js/text.js +++ b/frameworks/examples/showcase/src/main/js/default/common/js/text.js @@ -13,14 +13,14 @@ * limitations under the License. */ export const changeShow = function() { - if (this.showStatus == true) { + if (this.showStatus === true) { this.showStatus = false; } else { this.showStatus = true; } }; export const changeStatusIf = function() { - if (this.ifStatus == true) { + if (this.ifStatus === true) { this.ifStatus = false; } else { this.ifStatus = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js index 40aef984293b01378780755a62801d5a283d34b0..26528999968c9c12f577c65940878cfb3a04eb48 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation1/animation1.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation1.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index1/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js index c6efdd9d5b171f9d406bec12ff9e325bcceeda4c..ba2ed46d0cae483a2f48f3c65a867f7ff7b5dc38 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation2/animation2.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation2.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index1/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js index 0f30338698e276ee1a950c8d5ce00d8abbf10628..dc2049630584704321a60557edca041afc22653a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation3/animation3.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation3.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index1/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js index 352f10f911e18cdd03717665354f77064b2bfd74..e9f278bc90145464db6868fd54d012c80b00fbda 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation4/animation4.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation4.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index1/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js index 66f7c948c1ad8b895f3b858178e44839d275da99..6dc3f71b8d39315c89095c15092505a38455c066 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation5/animation5.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation5.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index2/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js index 581de134d37f36b64c0b7b2a05e9bc3c3a280cfc..43ae1696cba6648d7b6375074030c1895fa922be 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation6/animation6.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation6.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index2/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js index dd032404283cd6898b79216c6b449e7ca7934717..37f25bf44c67f7db3aa3045796da1c16d859d574 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/animation7/animation7.js @@ -13,7 +13,7 @@ * limitations under the License. */ // animation7.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index2/index") + ...backPage('pages/component/animation/index1/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.js index bf283baae577fd0127148fb7e1b6b1f0a0efb9d6..80799c89a1d6208983c15ba350500f455dd5a64d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index/index.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/otherIndex/index"), - changePage1: routePage("pages/component/animation/index1/index").changePage, - changePage2: routePage("pages/component/animation/index2/index").changePage + ...backPage('pages/component/index/otherIndex/index'), + changePage1: routePage('pages/component/animation/index1/index').changePage, + changePage2: routePage('pages/component/animation/index2/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js index e6e9d6a32f9688943ef72e62fe7c24e5809f2e77..0671546084b076d923df2d0db98b41e9615c854e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index1/index.js @@ -12,11 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index/index"), - changePage1: routePage("pages/component/animation/animation1/animation1").changePage, - changePage2: routePage("pages/component/animation/animation2/animation2").changePage, - changePage3: routePage("pages/component/animation/animation3/animation3").changePage, - changePage4: routePage("pages/component/animation/animation4/animation4").changePage + ...backPage('pages/component/animation/index/index'), + changePage1: routePage('pages/component/animation/animation1/animation1').changePage, + changePage2: routePage('pages/component/animation/animation2/animation2').changePage, + changePage3: routePage('pages/component/animation/animation3/animation3').changePage, + changePage4: routePage('pages/component/animation/animation4/animation4').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js index 0fc1106b80e59cac893fb2b14f4a1437c821056c..b1b14c839e28b9de64bdb95d83f4dbc30938fa52 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/animation/index2/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/animation/index/index"), - changePage1: routePage("pages/component/animation/animation5/animation5").changePage, - changePage2: routePage("pages/component/animation/animation6/animation6").changePage, - changePage3: routePage("pages/component/animation/animation7/animation7").changePage + ...backPage('pages/component/animation/index/index'), + changePage1: routePage('pages/component/animation/animation5/animation5').changePage, + changePage2: routePage('pages/component/animation/animation6/animation6').changePage, + changePage3: routePage('pages/component/animation/animation7/animation7').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js index 30decb8bb23b823be791146d97e74e713c101152..849343c724295f78c224dddbfbda85ddd32caf33 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas1/index.js @@ -13,20 +13,20 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, - ...backPage("pages/component/canvas/indexAttr/index"), + ...backPage('pages/component/canvas/indexAttr/index'), fillRectFunc: function() { - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); ctx.fillRect(20, 20, 100, 150); }, changeStatus: function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js index 80348157fd17d7f9bf4c7545234a85e63c80bb3c..193d57fc760b106bc4a03e81d181d2fec70e9f10 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas2/index.js @@ -13,20 +13,20 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', ifStatus: true }, - ...backPage("pages/component/canvas/indexAttr/index"), + ...backPage('pages/component/canvas/indexAttr/index'), fillRectFunc: function() { - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); ctx.fillRect(20, 20, 100, 150); }, changeIf: function() { - if (this.ifStatus == true) { + if (this.ifStatus === true) { this.ifStatus = false; } else { this.ifStatus = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js index 5ba27e3fb23ed37e5c43356a3bbd49ff71e9b372..2d1e09a757d0c5036ebec15d10d942bfd7fb5c70 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas3/index.js @@ -13,19 +13,20 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - listData: ["a", "b"], - text1: "for类型canvas" + listData: ['a', 'b'], + text1: 'for类型canvas' }, - ...backPage("pages/component/canvas/indexAttr/index"), + ...backPage('pages/component/canvas/indexAttr/index'), fillRectFunc: function() { - var canvasRefa = this.$refs.canvasa; - var ctxa = canvasRefa.getContext("2d"); + let canvasRefa = this.$refs.canvasa; + let ctxa = canvasRefa.getContext('2d'); ctxa.fillRect(20, 20, 40, 150); - var canvasRefb = this.$refs.canvasb; - var ctxb = canvasRefb.getContext("2d"); + let canvasRefb = this.$refs.canvasb; + let ctxb = canvasRefb.getContext('2d'); ctxb.fillRect(20, 20, 30, 100); } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js index bdc917d2f477b40e674832a6f78706a6adda218d..6d99f49c4969ebc1d2bba18076a44f05975a3749 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas4/index.js @@ -13,17 +13,18 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "上面绿块为canvas", - text2: "背景=绿，", - text3: "left=85，top=120" + text1: '上面绿块为canvas', + text2: '背景=绿，', + text3: 'left=85，top=120' }, - ...backPage("pages/component/canvas/indexCommonStyle/index"), + ...backPage('pages/component/canvas/indexCommonStyle/index'), fillRect: function() { - var canvasRef = this.$refs.canvasObj; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvasObj; + let ctx = canvasRef.getContext('2d'); ctx.fillRect(20, 20, 100, 150); } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js index deeda9eb0e994399c7a4c1c6484703a7794ffe7a..aea65ef7de1469f2ded263043e1d868937978484 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas5/index.js @@ -13,12 +13,12 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "上面黄块为canvas", - text2: "margin=20", - text3: "width=280,height=80" + text1: '上面黄块为canvas', + text2: 'margin=20', + text3: 'width=280,height=80' }, - ...backPage("pages/component/canvas/indexCommonStyle/index") + ...backPage('pages/component/canvas/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js index d8a80c3dd8662a763eed7f041e1c3f5566030981..b5185b45aae338ba1df983fc7e136e84642ce506 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas6/index.js @@ -13,17 +13,17 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "边框和内边距" + text1: '边框和内边距' }, - ...backPage("pages/component/canvas/indexCommonStyle/index"), + ...backPage('pages/component/canvas/indexCommonStyle/index'), fillStyleFunc: function() { - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); - ctx.fillStyle = "#00ff00"; - ctx.strokeStyle = "#ff0000"; // 因为是填充图形，所以边框设置无效 + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); + ctx.fillStyle = '#00ff00'; + ctx.strokeStyle = '#ff0000'; // 因为是填充图形，所以边框设置无效 ctx.fillRect(0, 0, 100, 150); } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js index a708e7b531fe857a1499fb4c13445e2ef6c33968..61f14f3f2cfd1fb26e117a1d017f4965a31757d6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas7/index.js @@ -13,12 +13,13 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "上面绿块为canvas", - text2: "左外=40，上外=15,", - text3: "右外=10，下外=20" + text1: '上面绿块为canvas', + text2: '左外=40，上外=15,', + text3: '右外=10，下外=20' }, - ...backPage("pages/component/canvas/indexCommonStyle/index") + ...backPage('pages/component/canvas/indexCommonStyle/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js index 878e11a17bfb3042a7faf52f2d11741e08fc8779..5121a3d711a6670bf6a4c7ab23455a97f195081e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas8/index.js @@ -13,20 +13,20 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "上面绿块为canvas", - text2: "点击按钮切换display", - text3: "支持flex/none", - displayValue: "flex" + text1: '上面绿块为canvas', + text2: '点击按钮切换display', + text3: '支持flex/none', + displayValue: 'flex' }, - ...backPage("pages/component/canvas/indexCommonStyle/index"), + ...backPage('pages/component/canvas/indexCommonStyle/index'), changeDisplay: function() { - if (this.displayValue === "flex") { - this.displayValue = "none"; + if (this.displayValue === 'flex') { + this.displayValue = 'none'; } else { - this.displayValue = "flex"; + this.displayValue = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js index 5337930761837f2285c13ff66d7a07937c02a3cf..e56e24a7bc108e9cab40925eb97677bc03a90023 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/canvas9/index.js @@ -13,29 +13,29 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "" + text1: '' }, - ...backPage("pages/component/canvas/indexEvent/index"), + ...backPage('pages/component/canvas/indexEvent/index'), clickFunc: function() { - this.text1 = "点击事件被触发"; - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); - ctx.fillStyle = "#ffff00"; - ctx.strokeStyle = "#ff0000"; // 因为是填充图形，所以边框设置无效 + this.text1 = '点击事件被触发'; + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); + ctx.fillStyle = '#ffff00'; + ctx.strokeStyle = '#ff0000'; // 因为是填充图形，所以边框设置无效 ctx.fillRect(10, 10, 50, 100); }, longPressFunc: function() { - this.text1 = "长按事件被触发"; - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); - ctx.fillStyle = "#ff0000"; - ctx.strokeStyle = "#ff0000"; // 因为是填充图形，所以边框设置无效 + this.text1 = '长按事件被触发'; + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); + ctx.fillStyle = '#ff0000'; + ctx.strokeStyle = '#ff0000'; // 因为是填充图形，所以边框设置无效 ctx.fillRect(10, 10, 50, 100); }, swipeFunc: function(e) { - this.text1 = "swipe方向：" + e.direction; + this.text1 = 'swipe方向：' + e.direction; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js index e968147b5687ad629e7df38a36671fc20e3a74ee..166c4a3b36744dc0d384bd90cf6834067e43a7f1 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/index/index.js @@ -13,11 +13,11 @@ * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/index/baseIndex/index"), - changePage1: routePage("pages/component/canvas/indexAttr/index").changePage, - changePage2: routePage("pages/component/canvas/indexCommonStyle/index").changePage, - changePage3: routePage("pages/component/canvas/indexEvent/index").changePage, - changePage4: routePage("pages/component/canvas/indexAPI/index").changePage + ...goPage('pages/component/index/baseIndex/index'), + changePage1: routePage('pages/component/canvas/indexAttr/index').changePage, + changePage2: routePage('pages/component/canvas/indexCommonStyle/index').changePage, + changePage3: routePage('pages/component/canvas/indexEvent/index').changePage, + changePage4: routePage('pages/component/canvas/indexAPI/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js index ecec08f7c5872976e3084db3e179986eb3d60659..9d864d846f916df1f639730c3be806bf9e66ddf9 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPI/index.js @@ -13,9 +13,10 @@ * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/canvas/index/index"), - changePage1: routePage("pages/component/canvas/indexAPIAttr/index").changePage, - changePage2: routePage("pages/component/canvas/indexAPIDraw/index").changePage + ...goPage('pages/component/canvas/index/index'), + changePage1: routePage('pages/component/canvas/indexAPIAttr/index').changePage, + changePage2: routePage('pages/component/canvas/indexAPIDraw/index').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js index 2cad38aa8e5ae59f06f45264495f84ede25769a0..d1fd7870bbfa7713529366fb176b2fd582173066 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIAttr/index.js @@ -13,101 +13,101 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/canvas/indexAPI/index"), + ...backPage('pages/component/canvas/indexAPI/index'), fillStyleFunc: function() { - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); - var getFillStyle1 = ctx.fillStyle; // getter默认fillStyle - console.info("getFillStyle1=" + getFillStyle1); + let getFillStyle1 = ctx.fillStyle; // getter默认fillStyle + console.info('getFillStyle1=' + getFillStyle1); - var getFillStyle2 = ctx.fillStyle; // 再次getter默认fillStyle - console.info("getFillStyle2=" + getFillStyle2); + let getFillStyle2 = ctx.fillStyle; // 再次getter默认fillStyle + console.info('getFillStyle2=' + getFillStyle2); - ctx.fillStyle = "#00ff00"; // setter - //ctx.fillStyle = "rgba(0,255,0,1)"; //支持 - //ctx.fillStyle = "red"; //不支持 - ctx.strokeStyle = "#ff0000"; // 因为是填充图形，所以边框设置无效 + ctx.fillStyle = '#00ff00'; // setter + //ctx.fillStyle = 'rgba(0,255,0,1)'; //支持 + //ctx.fillStyle = 'red'; //不支持 + ctx.strokeStyle = '#ff0000'; // 因为是填充图形，所以边框设置无效 - var getFillStyle3 = ctx.fillStyle; // setter后getter fillStyle - console.info("getFillStyle3=" + getFillStyle3); + let getFillStyle3 = ctx.fillStyle; // setter后getter fillStyle + console.info('getFillStyle3=' + getFillStyle3); ctx.fillRect(20, 20, 100, 150); }, strokeStyleFunc: function() { - var canvasRef = this.$refs.canvas2; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas2; + let ctx = canvasRef.getContext('2d'); - var getStrokeStyle1 = ctx.strokeStyle; // getter默认strokeStyle - console.info("getStrokeStyle1=" + getStrokeStyle1); - var getStrokeStyle2 = ctx.strokeStyle; // 再次getter默认strokeStyle - console.info("getStrokeStyle2=" + getStrokeStyle2); + let getStrokeStyle1 = ctx.strokeStyle; // getter默认strokeStyle + console.info('getStrokeStyle1=' + getStrokeStyle1); + let getStrokeStyle2 = ctx.strokeStyle; // 再次getter默认strokeStyle + console.info('getStrokeStyle2=' + getStrokeStyle2); - ctx.fillStyle = "#00ff00"; // 因为是画矩形框，所以填充设置无效 - ctx.strokeStyle = "#0000ff"; // setter + ctx.fillStyle = '#00ff00'; // 因为是画矩形框，所以填充设置无效 + ctx.strokeStyle = '#0000ff'; // setter - var getStrokeStyle3 = ctx.strokeStyle; // setter之后getter strokeStyle - console.info("getStrokeStyle3=" + getStrokeStyle3); + let getStrokeStyle3 = ctx.strokeStyle; // setter之后getter strokeStyle + console.info('getStrokeStyle3=' + getStrokeStyle3); ctx.strokeRect(20, 20, 100, 150); }, lineWidthFunc: function() { - var canvasRef = this.$refs.canvas3; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas3; + let ctx = canvasRef.getContext('2d'); - var getLineWidth1 = ctx.lineWidth; // getter默认lineWidth - console.info("getLineWidth1=" + getLineWidth1); + let getLineWidth1 = ctx.lineWidth; // getter默认lineWidth + console.info('getLineWidth1=' + getLineWidth1); - var getLineWidth2 = ctx.lineWidth; // 再次getter默认lineWidth - console.info("getLineWidth2=" + getLineWidth2); + let getLineWidth2 = ctx.lineWidth; // 再次getter默认lineWidth + console.info('getLineWidth2=' + getLineWidth2); - ctx.strokeStyle = "#ff0000"; - ctx.lineWidth = "10"; // setter + ctx.strokeStyle = '#ff0000'; + ctx.lineWidth = '10'; // setter - var getLineWidth3 = ctx.lineWidth; // setter后getter lineWidth - console.info("getLineWidth3=" + getLineWidth3); + let getLineWidth3 = ctx.lineWidth; // setter后getter lineWidth + console.info('getLineWidth3=' + getLineWidth3); ctx.strokeRect(20, 20, 100, 150); }, fontFunc: function() { - var canvasRef = this.$refs.canvas4; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas4; + let ctx = canvasRef.getContext('2d'); - var getFont1 = ctx.font; // getter默认font - console.info("getFont1=" + getFont1); + let getFont1 = ctx.font; // getter默认font + console.info('getFont1=' + getFont1); - var getFont2 = ctx.font; // 再次getter默认font - console.info("getFont2=" + getFont2); + let getFont2 = ctx.font; // 再次getter默认font + console.info('getFont2=' + getFont2); - ctx.font = " 30px SourceHanSansSC-Regular two three f "; // setter - //ctx.font = " "; // setter + ctx.font = ' 30px SourceHanSansSC-Regular two three f '; // setter + //ctx.font = ' '; // setter - var getFont3 = ctx.font; // setter后getter font - console.info("getFont3=" + getFont3); + let getFont3 = ctx.font; // setter后getter font + console.info('getFont3=' + getFont3); - ctx.fillText("Hello JS", 10, 20); - ctx.fillText("JS Hello", 10, 70); + ctx.fillText('Hello JS', 10, 20); + ctx.fillText('JS Hello', 10, 70); }, textAlignFunc: function() { - var canvasRef = this.$refs.canvas5; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas5; + let ctx = canvasRef.getContext('2d'); - var getTextAlign1 = ctx.textAlign; // getter默认text align - console.info("getTextAlign1=" + getTextAlign1); + let getTextAlign1 = ctx.textAlign; // getter默认text align + console.info('getTextAlign1=' + getTextAlign1); - var getTextAlign2 = ctx.textAlign; // 再次getter默认text align - console.info("getTextAlign2=" + getTextAlign2); + let getTextAlign2 = ctx.textAlign; // 再次getter默认text align + console.info('getTextAlign2=' + getTextAlign2); - ctx.font = "30px SourceHanSansSC-Regular"; - ctx.textAlign = "left"; // setter - ctx.fillText("left", 110, 10); - ctx.textAlign = "right"; // setter - ctx.fillText("right", 110, 50); - ctx.textAlign = "center"; // setter - ctx.fillText("center", 110, 100); + ctx.font = '30px SourceHanSansSC-Regular'; + ctx.textAlign = 'left'; // setter + ctx.fillText('left', 110, 10); + ctx.textAlign = 'right'; // setter + ctx.fillText('right', 110, 50); + ctx.textAlign = 'center'; // setter + ctx.fillText('center', 110, 100); - var getTextAlign3 = ctx.textAlign; // setter后 getter text align - console.info("getTextAlign3=" + getTextAlign3); + let getTextAlign3 = ctx.textAlign; // setter后 getter text align + console.info('getTextAlign3=' + getTextAlign3); }, - jumpFunc: routePage("pages/component/canvas/indexAPIAttr/index").changePage + jumpFunc: routePage('pages/component/canvas/indexAPIAttr/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js index ab9f718d2b1ee2d33a0d2e3c66929b12b86b8a95..f37096a6a1e83ec900a857d03278d0450fb0a008 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAPIDraw/index.js @@ -13,28 +13,28 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/canvas/indexAPI/index"), + ...backPage('pages/component/canvas/indexAPI/index'), fillRectFunc: function() { - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas1; + let ctx = canvasRef.getContext('2d'); ctx.fillRect(20, 20, 100, 150); }, strokeRectFunc: function() { - var canvasRef = this.$refs.canvas2; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas2; + let ctx = canvasRef.getContext('2d'); ctx.strokeRect(20, 20, 100, 150); }, fillTextFunc: function() { - var canvasRef = this.$refs.canvas3; - var ctx = canvasRef.getContext("2d"); - ctx.font = "30px SourceHanSansSC-Regular"; - ctx.fillText("Hello JS", 10, 50); + let canvasRef = this.$refs.canvas3; + let ctx = canvasRef.getContext('2d'); + ctx.font = '30px SourceHanSansSC-Regular'; + ctx.fillText('Hello JS', 10, 50); }, arcFunc: function() { - var canvasRef = this.$refs.canvas4; - var ctx = canvasRef.getContext("2d"); + let canvasRef = this.$refs.canvas4; + let ctx = canvasRef.getContext('2d'); ctx.beginPath(); ctx.arc(50, 50, 50, Math.PI * 2 * (1 / 36), Math.PI * 2 * (5 / 36), true); ctx.stroke(); diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js index 8fefde29a73c236087c5599367b4a4b749acbaa9..f565fcb95a8fc6509135df557b7dc470aba5690d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexAttr/index.js @@ -13,10 +13,11 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/canvas/index/index"), - changePage1: routePage("pages/component/canvas/canvas1/index").changePage, - changePage2: routePage("pages/component/canvas/canvas2/index").changePage, - changePage3: routePage("pages/component/canvas/canvas3/index").changePage + ...backPage('pages/component/canvas/index/index'), + changePage1: routePage('pages/component/canvas/canvas1/index').changePage, + changePage2: routePage('pages/component/canvas/canvas2/index').changePage, + changePage3: routePage('pages/component/canvas/canvas3/index').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js index cece0e010b52c5e8ca84caadb433a57a9efa479e..32e02c6e837404f0a6e5bb211133554ba7fa99ae 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexCommonStyle/index.js @@ -13,12 +13,12 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/canvas/index/index"), - changePage1: routePage("pages/component/canvas/canvas4/index").changePage, - changePage2: routePage("pages/component/canvas/canvas5/index").changePage, - changePage3: routePage("pages/component/canvas/canvas6/index").changePage, - changePage4: routePage("pages/component/canvas/canvas7/index").changePage, - changePage5: routePage("pages/component/canvas/canvas8/index").changePage + ...backPage('pages/component/canvas/index/index'), + changePage1: routePage('pages/component/canvas/canvas4/index').changePage, + changePage2: routePage('pages/component/canvas/canvas5/index').changePage, + changePage3: routePage('pages/component/canvas/canvas6/index').changePage, + changePage4: routePage('pages/component/canvas/canvas7/index').changePage, + changePage5: routePage('pages/component/canvas/canvas8/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js index 0e37df0316834ecf1faf6b8f5290861c45d3119c..75ccab52a49c7cf105ad158d255436da25e50494 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/canvas/indexEvent/index.js @@ -13,8 +13,8 @@ * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/canvas/index/index"), - changePage1: routePage("pages/component/canvas/canvas9/index").changePage + ...backPage('pages/component/canvas/index/index'), + changePage1: routePage('pages/component/canvas/canvas9/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js index 482aa81132c70f5102a244cf89590d7c6e4710e4..4e2a0eb4613e78be32c054a755f67e3f3fcbadfc 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart1/barChart1.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage, eventCommon } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage, eventCommon } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexEvent/index"), + ...backPage('pages/component/chart/barChart/indexEvent/index'), data: { text1: eventCommon().text1, text2: eventCommon().text2, diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js index e37706856c5db8e8eeb5a8cee938407f8cccae3e..73dd72990fd58f3a45d2553b81948cdde81a4ed8 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart2/barChart2.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexStyle/index"), + ...backPage('pages/component/chart/barChart/indexStyle/index'), data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170", + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170', datasets: dataCommon.datasets.barsets, options: dataCommon.options } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js index 215d9257e04bbcd1fcff1642a6c54d576360ad4c..23e6e34def7f23074f618a0f3af27baff80d0368 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart3/barChart3.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexStyle/index"), + ...backPage('pages/component/chart/barChart/indexStyle/index'), data: { - text1: "margin左边距85", - text2: "margin上边距10", - text3: "宽高已设置", + text1: 'margin左边距85', + text2: 'margin上边距10', + text3: '宽高已设置', datasets: dataCommon.datasets.barsets, options: dataCommon.options } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js index 3977cc945ab3970dbf7bf80a034d5dd54d1c7cf1..f278088eebb8e8077e0a103f13b01d7de908be12 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart4/barChart4.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexStyle/index"), + ...backPage('pages/component/chart/barChart/indexStyle/index'), data: { datasets: dataCommon.datasets.barsets, options: dataCommon.options diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js index 94601b148ac1d944943a6725cb475924cb41ac9a..0b4ab47197c7f74ef5359f98b6ab4af3b521e667 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart5/barChart5.js @@ -12,12 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexAttr/index"), + ...backPage('pages/component/chart/barChart/indexAttr/index'), data: { datasets: dataCommon.datasets.barsets, options: dataCommon.optionsNoDisplay } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js index f3e99039da709ba93104ced0d2f73827adfd6fb1..dd4be11f006e265ae6542dd07176e7bfb923ee01 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart6/barChart6.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon, changeStatus } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon, changeStatus } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexAttr/index"), + ...backPage('pages/component/chart/barChart/indexAttr/index'), data: { - text1: "显示状态改变", - chart01: "chart01", + text1: '显示状态改变', + chart01: 'chart01', status: true, datasets: dataCommon.datasets.barsets, options: dataCommon.options diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js index 06dc2549891bbdef160a1e872352fc9dcb2e3ca1..c15edebedfd23e7dd8d18a09acf774fe96f5f9ea 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart7/barChart7.js @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon, changeStatus, changeDisplay } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon, changeStatus, changeDisplay } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexAttr/index"), + ...backPage('pages/component/chart/barChart/indexAttr/index'), data: { datasets: dataCommon.datasets.barsets, options: dataCommon.options, status: true, - text1: "显示状态改变", - loopArray: ["1", "2", "3"], - display: "flex" + text1: '显示状态改变', + loopArray: ['1', '2', '3'], + display: 'flex' }, changeStatus: changeStatus, changeDisplay: changeDisplay diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js index de94f2a06ca31b3e3f564ab5f575ecd293f18b9f..4d0c8e042b37b9c06b100b22a4c9bc626e46b70e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/barChart8/barChart8.js @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon, changeStatus } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon, changeStatus } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/barChart/indexAttr/index"), + ...backPage('pages/component/chart/barChart/indexAttr/index'), data: { datasets: dataCommon.datasets.barsets, options: dataCommon.options, status: true, - text1: "显示状态改变" + text1: '显示状态改变' }, changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js index ed594e8c1d2994d7d48c5acf758d4a0c64ad5905..344dac66130ebbad6952bfd35b4fe54808432a4e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/index/index"), - changePage1: routePage("pages/component/chart/barChart/indexAttr/index").changePage, - changePage2: routePage("pages/component/chart/barChart/indexStyle/index").changePage, - changePage3: routePage("pages/component/chart/barChart/indexEvent/index").changePage -}; + ...backPage('pages/component/chart/index/index'), + changePage1: routePage('pages/component/chart/barChart/indexAttr/index').changePage, + changePage2: routePage('pages/component/chart/barChart/indexStyle/index').changePage, + changePage3: routePage('pages/component/chart/barChart/indexEvent/index').changePage +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js index 1139db674206ec70f743a34f2d2eb931ca8157fc..699447f51055280d302cfe9a7e6d968f9809a416 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexAttr/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/barChart/index/index"), - changePage1: routePage("pages/component/chart/barChart/barChart6/barChart6").changePage, - changePage2: routePage("pages/component/chart/barChart/barChart5/barChart5").changePage, - changePage3: routePage("pages/component/chart/barChart/barChart7/barChart7").changePage, - changePage4: routePage("pages/component/chart/barChart/barChart8/barChart8").changePage + ...backPage('pages/component/chart/barChart/index/index'), + changePage1: routePage('pages/component/chart/barChart/barChart6/barChart6').changePage, + changePage2: routePage('pages/component/chart/barChart/barChart5/barChart5').changePage, + changePage3: routePage('pages/component/chart/barChart/barChart7/barChart7').changePage, + changePage4: routePage('pages/component/chart/barChart/barChart8/barChart8').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js index f31f79b6d05d3325474c81db29de5e1b571304d3..e0131c66b475c52269452f6539b6b430f6cdeaff 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/barChart/index/index"), - changePage1: routePage("pages/component/chart/barChart/barChart1/barChart1").changePage + ...backPage('pages/component/chart/barChart/index/index'), + changePage1: routePage('pages/component/chart/barChart/barChart1/barChart1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js index eb5869343b6b54e5fff020096bac3e360806ce34..8e32beb07df7c0bb6ba68f1fd08a40084e3b7b65 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/barChart/indexStyle/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/barChart/index/index"), - changePage1: routePage("pages/component/chart/barChart/barChart2/barChart2").changePage, - changePage2: routePage("pages/component/chart/barChart/barChart3/barChart3").changePage, - changePage3: routePage("pages/component/chart/barChart/barChart4/barChart4").changePage + ...backPage('pages/component/chart/barChart/index/index'), + changePage1: routePage('pages/component/chart/barChart/barChart2/barChart2').changePage, + changePage2: routePage('pages/component/chart/barChart/barChart3/barChart3').changePage, + changePage3: routePage('pages/component/chart/barChart/barChart4/barChart4').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.js index cfe5ed126f5c59d1c6ffa9fdf0f04329637c8a21..9a50d1ef434a756ec0409553f609514f253a171f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/index/index.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/baseIndex/index"), - changeBar: routePage("pages/component/chart/barChart/index/index").changePage, - changeLine: routePage("pages/component/chart/lineChart/index/index").changePage -}; + ...backPage('pages/component/index/baseIndex/index'), + changeBar: routePage('pages/component/chart/barChart/index/index').changePage, + changeLine: routePage('pages/component/chart/lineChart/index/index').changePage +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js index 30f8dc448c2d952e3821236d25d8b9aeb2dd62c4..7ae5b082b44c3690bc5af22b565b00c56b51273f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/index/index"), - changePage1: routePage("pages/component/chart/lineChart/indexAttr/index").changePage, - changePage2: routePage("pages/component/chart/lineChart/indexStyle/index").changePage, - changePage3: routePage("pages/component/chart/lineChart/indexEvent/index").changePage -}; + ...backPage('pages/component/chart/index/index'), + changePage1: routePage('pages/component/chart/lineChart/indexAttr/index').changePage, + changePage2: routePage('pages/component/chart/lineChart/indexStyle/index').changePage, + changePage3: routePage('pages/component/chart/lineChart/indexEvent/index').changePage +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js index 49a2644323e5f65dfe22043c5a9e98455f1ca5b8..e3ace4142374327e1597b102b0b9c1a48dbee130 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexAttr/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/lineChart/index/index"), - changePage1: routePage("pages/component/chart/lineChart/lineChart6/lineChart6").changePage, - changePage2: routePage("pages/component/chart/lineChart/lineChart5/lineChart5").changePage, - changePage3: routePage("pages/component/chart/lineChart/lineChart7/lineChart7").changePage, - changePage4: routePage("pages/component/chart/lineChart/lineChart8/lineChart8").changePage + ...backPage('pages/component/chart/lineChart/index/index'), + changePage1: routePage('pages/component/chart/lineChart/lineChart6/lineChart6').changePage, + changePage2: routePage('pages/component/chart/lineChart/lineChart5/lineChart5').changePage, + changePage3: routePage('pages/component/chart/lineChart/lineChart7/lineChart7').changePage, + changePage4: routePage('pages/component/chart/lineChart/lineChart8/lineChart8').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js index 1584aa4ec5adcda7418f837a2b1578b0fe83e1e0..c48b8acf591b158636f1d315b8136ba8db187693 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/lineChart/index/index"), - changePage1: routePage("pages/component/chart/lineChart/lineChart1/lineChart1").changePage + ...backPage('pages/component/chart/lineChart/index/index'), + changePage1: routePage('pages/component/chart/lineChart/lineChart1/lineChart1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js index 1dd154c4e76c43f056ba80082e889bdd82ea5242..e09ddccd2588e0ed99f7d3bc44b06c96fdab537a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/indexStyle/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/chart/lineChart/index/index"), - changePage1: routePage("pages/component/chart/lineChart/lineChart2/lineChart2").changePage, - changePage2: routePage("pages/component/chart/lineChart/lineChart3/lineChart3").changePage, - changePage3: routePage("pages/component/chart/lineChart/lineChart4/lineChart4").changePage + ...backPage('pages/component/chart/lineChart/index/index'), + changePage1: routePage('pages/component/chart/lineChart/lineChart2/lineChart2').changePage, + changePage2: routePage('pages/component/chart/lineChart/lineChart3/lineChart3').changePage, + changePage3: routePage('pages/component/chart/lineChart/lineChart4/lineChart4').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js index 73d597eee8ff1848f14c5696f13f23915e64489b..fc501fd02b9547dba72b3823b1be42f2f35ad93a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart1/lineChart1.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage, eventCommon } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage, eventCommon } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexEvent/index"), + ...backPage('pages/component/chart/lineChart/indexEvent/index'), data: { datasets: dataCommon.datasets.linesets, options: dataCommon.options, diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js index 6c554a9285dbfe7554f57c227dc0d60ce1509262..67a649fc9e09b920b0731b88e8ef42a42db43b49 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart2/lineChart2.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexStyle/index"), + ...backPage('pages/component/chart/lineChart/indexStyle/index'), data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170", + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170', datasets: dataCommon.datasets.linesets, options: dataCommon.options } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js index 60845ffe25aa8eba7c690ea07b8d21d09255c505..13696195dfab5558d601c0f9c6ef670f6f2ef10a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart3/lineChart3.js @@ -12,15 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexStyle/index"), + ...backPage('pages/component/chart/lineChart/indexStyle/index'), data: { datasets: dataCommon.datasets.linesets, options: dataCommon.options, - text1: "margin左边距85", - text2: "margin上边距10", - text3: "宽高已设置" + text1: 'margin左边距85', + text2: 'margin上边距10', + text3: '宽高已设置' } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js index 11c25adbdf6528491fa93ac065d65490fcddfefb..8b6b3bce54d0548bd89b81534862a6c7a2f9571c 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart4/lineChart4.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexStyle/index"), + ...backPage('pages/component/chart/lineChart/indexStyle/index'), data: { datasets: dataCommon.datasets.linesets, options: dataCommon.options diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js index ac1bc0d16c5382d9abb6902bfa7f16af23358ae4..85c0fb0fc437f3cbb255b256f1a066c6a831a205 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart5/lineChart5.js @@ -12,12 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexAttr/index"), + ...backPage('pages/component/chart/lineChart/indexAttr/index'), data: { datasets: dataCommon.datasets.linesets, options: dataCommon.optionsNoDisplay } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js index a870b1486bace8ef904e6d9167596dcf7bad5da9..dd19ebf371d10d3415df4215296f17a82b22edf7 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart6/lineChart6.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon, changeStatus } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon, changeStatus } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexAttr/index"), + ...backPage('pages/component/chart/lineChart/indexAttr/index'), data: { datasets: dataCommon.datasets.linesets, options: dataCommon.options, - chart01: "chart01", + chart01: 'chart01', status: true, - text1: "显示状态改变" + text1: '显示状态改变' }, changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js index 86a6d766ed608a09755a3af46712c3c0a418dcc6..e4200847a6af96f0731a2ed0090c0deedf5813c2 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart7/lineChart7.js @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon, changeStatus, changeDisplay } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon, changeStatus, changeDisplay } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexAttr/index"), + ...backPage('pages/component/chart/lineChart/indexAttr/index'), changeStatus: changeStatus, changeDisplay: changeDisplay, data: { - loopArray: ["1", "2", "3"], - display: "flex", + loopArray: ['1', '2', '3'], + display: 'flex', status: true, - text1: "显示状态改变", + text1: '显示状态改变', datasets: dataCommon.datasets.linesets, options: dataCommon.options } diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js index d9c519f781f35d584600fe03e5136c3b48cad0f4..33ae2cbf23a058a86883038030c6f908867a7c09 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/chart/lineChart/lineChart8/lineChart8.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { dataCommon, changeStatus } from "../../../../../common/js/chart"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { dataCommon, changeStatus } from '../../../../../common/js/chart'; export default { - ...backPage("pages/component/chart/lineChart/indexAttr/index"), + ...backPage('pages/component/chart/lineChart/indexAttr/index'), data: { status: true, - text1: "显示状态改变", + text1: '显示状态改变', datasets: dataCommon.datasets.linesets, options: dataCommon.options }, diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js index 7b3579453effa0b92fd8708bdca12461d4be3208..b264fd59bdebf51c9dd0bd4823026eeaf5d88b83 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div1/div1.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, eventCommon } from "../../../../common/js/general"; +import { backPage, eventCommon } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexEvent/index"), + ...backPage('pages/component/div/indexEvent/index'), data: { text1: eventCommon().text1, text2: eventCommon().text2, diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js index fa0134692e5128fca136578b3d2f9e1f782b5140..d1d1627cdd828c04cd94422511e80f6b30b25336 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div10/div10.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexAttr/index"), + ...backPage('pages/component/div/indexAttr/index'), data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true, - div01: "div01" + div01: 'div01' }, changeStatus: function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js index 9e6d8323c96764798255e3b08353cd810da917e2..87c39a535dfdbb87a5d7a0286a5e733bb88df492 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div11/div11.js @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexAttr/index"), + ...backPage('pages/component/div/indexAttr/index'), data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, changeStatus: function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js index 18ea77eadde9940d7e60e820439d63b42f3a3376..1ac63dd5f8b026ef920daeac281c0961fab49429 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div12/div12.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexAttr/index"), + ...backPage('pages/component/div/indexAttr/index'), data: { - text1: "点击按钮改变状态", - loopArray: ["1", "2", "3"], - display: "flex" + text1: '点击按钮改变状态', + loopArray: ['1', '2', '3'], + display: 'flex' }, changeDisplay: function() { - if (this.display === "flex") { - this.display = "none"; + if (this.display === 'flex') { + this.display = 'none'; } else { - this.display = "flex"; + this.display = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js index 43889425ae7dae767ff72476ce0aba36c8eca86a..42559bead29d97f0b57f66eb3f9d5e08009d8704 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div2/div2.js @@ -12,18 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexCommonStyle/index"), + ...backPage('pages/component/div/indexCommonStyle/index'), data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170" + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170' }, clickFunc: function() { - this.text1 = "点击事件已触发"; + this.text1 = '点击事件已触发'; }, longpressFunc: function() { - this.text2 = "长按事件已触发"; + this.text2 = '长按事件已触发'; } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js index 477954fcbb0c6f63bb7af9c2db5476cb768c7fb8..d97a3e5c63fad9cae55a79057954d471a743aa12 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div3/div3.js @@ -13,7 +13,7 @@ * limitations under the License. */ // div3.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexCommonStyle/index") + ...backPage('pages/component/div/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js index bf709b1ab2554b3c7c88fdd2c0983fceb4667096..4ddcbc8f50ed7c4a65a024edd55688dcdf56d4fa 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div4/div4.js @@ -13,7 +13,7 @@ * limitations under the License. */ // div4.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexCommonStyle/index") + ...backPage('pages/component/div/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js index 85e39dd1dacf97917ced374ab67471f496ee4eac..7bbcc3befb1fd0205a4e17a1b4082e9a1820aef9 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div5/div5.js @@ -13,7 +13,7 @@ * limitations under the License. */ // div5.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexSpecStyle/index") + ...backPage('pages/component/div/indexSpecStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js index c01694922e97be8540182c584488ba17ae17d0d4..99357a9c421024958d33eb1ef231925583496c06 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div6/div6.js @@ -13,7 +13,7 @@ * limitations under the License. */ // div6.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexSpecStyle/index") + ...backPage('pages/component/div/indexSpecStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js index 30abde756d6278f0f40331c1f6c2a7275cc8def3..7ef6587f2b2258e3060c1ad2f299a0b2459880c4 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div7/div7.js @@ -13,7 +13,7 @@ * limitations under the License. */ // div7.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexSpecStyle/index") + ...backPage('pages/component/div/indexSpecStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js index ca5621d1a2e28730004bbd8d7949f38d1dde7279..13e2f1b580743b750ff55f16759f74d8745596b3 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div8/div8.js @@ -13,7 +13,8 @@ * limitations under the License. */ // div8.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexSpecStyle/index") + ...backPage('pages/component/div/indexSpecStyle/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js index 33e89a40db8470b2a0da197dd896ad095a75dcda..a579217bf9ab12de25ae2338fdd2c9e7ed2e4d45 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/div9/div9.js @@ -13,7 +13,7 @@ * limitations under the License. */ // div9.js -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/indexSpecStyle/index") + ...backPage('pages/component/div/indexSpecStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.js index cca77d7439e138c57f75988c3bedcc9f99c5180d..571b2453db7d6d5533d257de8a2d0da8fe615897 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/index/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/containerIndex/index"), - changePage1: routePage("pages/component/div/indexAttr/index").changePage, - changePage2: routePage("pages/component/div/indexCommonStyle/index").changePage, - changePage3: routePage("pages/component/div/indexSpecStyle/index").changePage, - changePage4: routePage("pages/component/div/indexEvent/index").changePage + ...backPage('pages/component/index/containerIndex/index'), + changePage1: routePage('pages/component/div/indexAttr/index').changePage, + changePage2: routePage('pages/component/div/indexCommonStyle/index').changePage, + changePage3: routePage('pages/component/div/indexSpecStyle/index').changePage, + changePage4: routePage('pages/component/div/indexEvent/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js index a6a2b8032fc582c1f12bdd643289531bac2411f3..1b23196d21e74a1cdb5e2d32cc5beb1c4f8eb16a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexAttr/index.js @@ -12,10 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/index/index"), - changePage1: routePage("pages/component/div/div11/div11").changePage, - changePage2: routePage("pages/component/div/div10/div10").changePage, - changePage3: routePage("pages/component/div/div12/div12").changePage + ...backPage('pages/component/div/index/index'), + changePage1: routePage('pages/component/div/div11/div11').changePage, + changePage2: routePage('pages/component/div/div10/div10').changePage, + changePage3: routePage('pages/component/div/div12/div12').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js index 685f00b48477ff53410fda40d6d3965817e7f540..8b1639763d32b07b04ebd13478c5411ae672bb0f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexCommonStyle/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/index/index"), - changePage1: routePage("pages/component/div/div2/div2").changePage, - changePage2: routePage("pages/component/div/div3/div3").changePage, - changePage3: routePage("pages/component/div/div4/div4").changePage + ...backPage('pages/component/div/index/index'), + changePage1: routePage('pages/component/div/div2/div2').changePage, + changePage2: routePage('pages/component/div/div3/div3').changePage, + changePage3: routePage('pages/component/div/div4/div4').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js index d9db99bfeef4e673bfc00a6820efbb52a69eb968..4095adf5b289d510fca2d9794aaac6c6a91337bf 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/index/index"), - changePage1: routePage("pages/component/div/div1/div1").changePage + ...backPage('pages/component/div/index/index'), + changePage1: routePage('pages/component/div/div1/div1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js index 8be12e652a31c0ab479fb7582e3d2ad4f2294e97..b001165e1e71eec4c26ae489e6464d4c1bbd8844 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/div/indexSpecStyle/index.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/div/index/index"), - changePage1: routePage("pages/component/div/div5/div5").changePage, - changePage2: routePage("pages/component/div/div6/div6").changePage, - changePage3: routePage("pages/component/div/div7/div7").changePage, - changePage4: routePage("pages/component/div/div8/div8").changePage, - changePage5: routePage("pages/component/div/div9/div9").changePage + ...backPage('pages/component/div/index/index'), + changePage1: routePage('pages/component/div/div5/div5').changePage, + changePage2: routePage('pages/component/div/div6/div6').changePage, + changePage3: routePage('pages/component/div/div7/div7').changePage, + changePage4: routePage('pages/component/div/div8/div8').changePage, + changePage5: routePage('pages/component/div/div9/div9').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js index 6da54493282b27f273f69c903c0e80b68b4967d4..49ec8931cb9962ed7f155dc5c94a6e62eb4dc79d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image1/image1.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/indexAttr/index") -}; + ...backPage('pages/component/image/indexAttr/index') +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js index 9bfb50ba3cacbb2177f74bdd8b41d36784d2d2b2..040f2ab82d5002038e66973c98b6fc0fc73bb860 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image2/image2.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, eventCommon } from "../../../../common/js/general"; +import { backPage, eventCommon } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/indexEvent/index"), + ...backPage('pages/component/image/indexEvent/index'), clickFunc: eventCommon().clickFunc, longpressFunc: eventCommon().longpressFunc, swipeFunc: eventCommon().swipeFunc, @@ -23,4 +23,4 @@ export default { text2: eventCommon().text2, text1: eventCommon().text1 } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js index 4d5288bbbabce0e651edad4249cf6e8fdf24494c..5f03378f2e9058ba2830c7b225caaf6021206cee 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image3/image3.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/indexStyle/index"), + ...backPage('pages/component/image/indexStyle/index'), data: { - text1: "距离背景已设置" + text1: '距离背景已设置' } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js index 7277d6c9a4372a7c6ed5335c4254ddae798a0d5c..14ea0bf421eb83ada68a100783fceb11be25145f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image4/image4.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/indexStyle/index"), + ...backPage('pages/component/image/indexStyle/index'), data: { - text1: "margin已设置", - text2: "宽高已设置" + text1: 'margin已设置', + text2: '宽高已设置' } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js index 0cbc25a8057f42cb3c2e1870e0a40632db7da539..b6660a477bbc2a108dc3dca842cece3bca16ea9c 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image5/image5.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/indexStyle/index") + ...backPage('pages/component/image/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js index 71849691b932195492cf6060bebe8ba62c32b6df..a0ec8cc59de26ebf2c30a1c9b1f833db6e58ec76 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image6/image6.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; -import { changeStatus } from "../../../../common/js/image"; +import { backPage } from '../../../../common/js/general'; +import { changeStatus } from '../../../../common/js/image'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true, - div01: "div01" + div01: 'div01' }, - ...backPage("pages/component/image/indexAttr/index"), + ...backPage('pages/component/image/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js index 08e8d020130ed3f01bcfde204a51a4699ebe2683..24623eb7bbd2a6c4c22cf189fe2d0fd713dddfb9 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image7/image7.js @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; +import { backPage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/indexAttr/index"), + ...backPage('pages/component/image/indexAttr/index'), changeDisplay: function() { - if (this.display === "flex") { - this.display = "none"; + if (this.display === 'flex') { + this.display = 'none'; } else { - this.display = "flex"; + this.display = 'flex'; } }, data: { - loopArray: ["1", "2", "3"], - display: "flex" + loopArray: ['1', '2', '3'], + display: 'flex' } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js index 865b0650903f3fbc2b52f51b532d00c1771d8186..3d5f37d3525f4cd6bcc4b6dce0728d4f49a7c1be 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/image8/image8.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; -import { changeStatus } from "../../../../common/js/image"; +import { backPage } from '../../../../common/js/general'; +import { changeStatus } from '../../../../common/js/image'; export default { - ...backPage("pages/component/image/indexAttr/index"), + ...backPage('pages/component/image/indexAttr/index'), changeStatus: changeStatus, data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.js index 5c55340cf36196a3b7768ca3c7cb93ccb0cbd262..04eadf63eef4312592c105feaeb888cd1a990939 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/baseIndex/index"), - changePage1: routePage("pages/component/image/indexAttr/index").changePage, - changePage2: routePage("pages/component/image/indexStyle/index").changePage, - changePage3: routePage("pages/component/image/indexEvent/index").changePage + ...backPage('pages/component/index/baseIndex/index'), + changePage1: routePage('pages/component/image/indexAttr/index').changePage, + changePage2: routePage('pages/component/image/indexStyle/index').changePage, + changePage3: routePage('pages/component/image/indexEvent/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js index e65c6f9f6e1b83d97443941bf6acf187c9b46871..bd0cb4bfd1a37b9b8e89a28338c00cee1bd1b790 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexAttr/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/index/index"), - changePage1: routePage("pages/component/image/image6/image6").changePage, - changePage2: routePage("pages/component/image/image7/image7").changePage, - changePage3: routePage("pages/component/image/image8/image8").changePage, - changePage4: routePage("pages/component/image/image1/image1").changePage + ...backPage('pages/component/image/index/index'), + changePage1: routePage('pages/component/image/image6/image6').changePage, + changePage2: routePage('pages/component/image/image7/image7').changePage, + changePage3: routePage('pages/component/image/image8/image8').changePage, + changePage4: routePage('pages/component/image/image1/image1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js index 8d72f226cc1ddb5f95d24c718e0a5370c34f65c3..45ac1a8c416484ec00e96febe1c658ac5887c2dd 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/index/index"), - changePage1: routePage("pages/component/image/image2/image2").changePage + ...backPage('pages/component/image/index/index'), + changePage1: routePage('pages/component/image/image2/image2').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js index 8af6d79663174f7316914ca2c3102ce6df781bbb..a6e22ec94397739bfea85db742a814eeae2f0dd2 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/image/indexStyle/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/image/index/index"), - changePage1: routePage("pages/component/image/image3/image3").changePage, - changePage2: routePage("pages/component/image/image4/image4").changePage, - changePage3: routePage("pages/component/image/image5/image5").changePage + ...backPage('pages/component/image/index/index'), + changePage1: routePage('pages/component/image/image3/image3').changePage, + changePage2: routePage('pages/component/image/image4/image4').changePage, + changePage3: routePage('pages/component/image/image5/image5').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js index a6d41b6e4f4f5b68064c90d5c604510e9d78a909..5d1bf25dcb7c354e7850505177c98ae315d3b132 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/index/baseIndex/index.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/index/index"), - changeImage: routePage("pages/component/image/index/index").changePage, - changeProgress: routePage("pages/component/progress/index/index").changePage, - changeText: routePage("pages/component/text/index/index").changePage, - changeMarquee: routePage("pages/component/marquee/index/index").changePage, - changeChart: routePage("pages/component/chart/index/index").changePage, - changeCanvas: routePage("pages/component/canvas/index/index").changePage, - changeImageAnimator: routePage("pages/component/animator/index/index").changePage, - changeInput: routePage("pages/component/input/index/index").changePage, - changePickerView: routePage("pages/component/picker_view/index/index").changePage, - changeQrcode: routePage("pages/component/qrcode/index/index").changePage, - changeSlider: routePage("pages/component/slider/index/index").changePage, - changeSwitch: routePage("pages/component/switch/index/index").changePage + ...backPage('pages/index/index'), + changeImage: routePage('pages/component/image/index/index').changePage, + changeProgress: routePage('pages/component/progress/index/index').changePage, + changeText: routePage('pages/component/text/index/index').changePage, + changeMarquee: routePage('pages/component/marquee/index/index').changePage, + changeChart: routePage('pages/component/chart/index/index').changePage, + changeCanvas: routePage('pages/component/canvas/index/index').changePage, + changeImageAnimator: routePage('pages/component/animator/index/index').changePage, + changeInput: routePage('pages/component/input/index/index').changePage, + changePickerView: routePage('pages/component/picker_view/index/index').changePage, + changeQrcode: routePage('pages/component/qrcode/index/index').changePage, + changeSlider: routePage('pages/component/slider/index/index').changePage, + changeSwitch: routePage('pages/component/switch/index/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js index 2122798066a55d39d2ed13ed106de807a65e5aba..bcbdad41e5fb4098b1b3ff9f59481099f7c4c34b 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/index/containerIndex/index.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/index/index"), - changeDiv: routePage("pages/component/div/index/index").changePage, - changeList: routePage("pages/component/list/index/index").changePage, - changeListItem: routePage("pages/component/list/list-item/index/index").changePage, - changeStack: routePage("pages/component/stack/index/index").changePage, - changeSwiper: routePage("pages/component/swiper/index/index").changePage -}; + ...backPage('pages/index/index'), + changeDiv: routePage('pages/component/div/index/index').changePage, + changeList: routePage('pages/component/list/index/index').changePage, + changeListItem: routePage('pages/component/list/list-item/index/index').changePage, + changeStack: routePage('pages/component/stack/index/index').changePage, + changeSwiper: routePage('pages/component/swiper/index/index').changePage +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js index fad7c4098b78d097d8cf4ae97f234fd228725960..a9205c5627b1fe1d7b94d61803522061af713062 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/index/formIndex/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/index/index"), - changeInput: routePage("pages/component/input/index/index").changePage, - changeSlider: routePage("pages/component/slider/index/index").changePage, - changeSwitch: routePage("pages/component/switch/index/index").changePage, - changePickerView: routePage("pages/component/picker_view/index/index").changePage -}; + ...backPage('pages/index/index'), + changeInput: routePage('pages/component/input/index/index').changePage, + changeSlider: routePage('pages/component/slider/index/index').changePage, + changeSwitch: routePage('pages/component/switch/index/index').changePage, + changePickerView: routePage('pages/component/picker_view/index/index').changePage +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js index 9518e7ff554d38692d684dc2b55d0997e963acf4..bb5b27e541fac918fa34e5aa61dd605ab9637783 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/index/otherIndex/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/index/index"), - changeAnimation: routePage("pages/component/animation/index/index").changePage + ...backPage('pages/index/index'), + changeAnimation: routePage('pages/component/animation/index/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js index 476f50f7005d15c73c419938ceba46a77fee5adc..d0e313e059cd0d418024910078dfa927ee378069 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/attr/attr.js @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -import { changeStatus, changeIf } from "../../../../../common/js/input"; +import { goPage, routePage } from '../../../../../common/js/general'; +import { changeStatus, changeIf } from '../../../../../common/js/input'; export default { data: { status: true, ifStatus: true, - valueList: ["for1", "for2"] + valueList: ['for1', 'for2'] }, - ...goPage("pages/component/input/button/index/index"), + ...goPage('pages/component/input/button/index/index'), changeStatus: changeStatus, changeIf: changeIf }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js index 6686c5f6d3ea73568a2328edf194f80a0d9ee7ba..0e4fcd75eabc2651aed7abac271f30daf411f1db 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/event/event.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { data: { - name: "点击触发" + name: '点击触发' }, clickEvent() { - this.name = "点击事件触发"; + this.name = '点击事件触发'; }, longpressEvent() { - this.name = "长按事件触发"; + this.name = '长按事件触发'; }, swipeEvent(e) { - this.name = "swipe方向：" + e.direction; + this.name = 'swipe方向：' + e.direction; }, - ...goPage("pages/component/input/button/index/index") + ...goPage('pages/component/input/button/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js index 9a575792479e07b762d1ba967dc3e36f39749d48..fc24fdb9c734205752fa8c63db3baa5262b09376 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - changePage1: routePage("pages/component/input/button/attr/attr").changePage, - changePage2: routePage("pages/component/input/button/style/style").changePage, - changePage3: routePage("pages/component/input/button/event/event").changePage, - ...backPage("pages/component/input/index/index") + changePage1: routePage('pages/component/input/button/attr/attr').changePage, + changePage2: routePage('pages/component/input/button/style/style').changePage, + changePage3: routePage('pages/component/input/button/event/event').changePage, + ...backPage('pages/component/input/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js index 143ef7aa049ab7694b738d302a75f4ef79f49b46..9b62c2c33d1f9c7790aaa75144624646051b116e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/button/style/style.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { - ...goPage("pages/component/input/index/index") -}; + ...goPage('pages/component/input/index/index') +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js index 8b8ce1680c37780dd2342096b1d235666577ecdf..1bffa26abc06eff7acb69202a3bcd6e748eb1a96 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/attr/attr.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -import { changeStatus, changeIf } from "../../../../../common/js/input"; +import { goPage, routePage } from '../../../../../common/js/general'; +import { changeStatus, changeIf } from '../../../../../common/js/input'; export default { data: { showAttr: true, @@ -21,9 +21,9 @@ export default { ifStatus: true, listData: [true, false] }, - ...goPage("pages/component/input/checkbox/index/index"), + ...goPage('pages/component/input/checkbox/index/index'), changeEvent(e) { - this.checked = "change触发"; + this.checked = 'change触发'; }, changeStatus(e) { this.show = e.checked; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js index e5bf40ad3793a833bdfbdf3bd1008eea79357759..90c4a11bbeacbcfa509b8aedb47551c37d6f0458 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/event/event.js @@ -12,24 +12,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { data: { - name: "点击或长按", - checked: "触发change", + name: '点击或长按', + checked: '触发change', show: true }, clickEvent() { - this.name = "点击事件触发"; + this.name = '点击事件触发'; }, longpressEvent() { - this.name = "长按事件触发"; + this.name = '长按事件触发'; }, swipeEvent(e) { - this.name = "swipe方向：" + e.direction; + this.name = 'swipe方向：' + e.direction; }, changeEvent(e) { - this.checked = "change触发"; + this.checked = 'change触发'; }, - ...goPage("pages/component/input/checkbox/index/index") + ...goPage('pages/component/input/checkbox/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js index fc33c05d6b21fc6d98078f419e21072db65b83a9..35bd32c41ef9dfb431cc1f2c716a60ea4ee22d3d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/input/index/index"), - changePage1: routePage("pages/component/input/checkbox/attr/attr").changePage, - changePage2: routePage("pages/component/input/checkbox/style/style").changePage, - changePage3: routePage("pages/component/input/checkbox/event/event").changePage + ...backPage('pages/component/input/index/index'), + changePage1: routePage('pages/component/input/checkbox/attr/attr').changePage, + changePage2: routePage('pages/component/input/checkbox/style/style').changePage, + changePage3: routePage('pages/component/input/checkbox/event/event').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js index 15b424da345515f1c01c32b57e5e7cb4190f505e..90bae0a97c5978fca7395ac75eaef939f5f345e7 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/checkbox/style/style.js @@ -12,7 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { - ...goPage("pages/component/input/checkbox/index/index") + ...goPage('pages/component/input/checkbox/index/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.js index e8e2e2ed3d693f98751438f3c8f2b80eb69aaac2..ab2402fdde770a2cfff8d69fb6b8faca140a668a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/index/formIndex/index"), - changeButton: routePage("pages/component/input/button/index/index").changePage, - changeCheckbox: routePage("pages/component/input/checkbox/index/index").changePage, - changeRadio: routePage("pages/component/input/radio/index/index").changePage + ...goPage('pages/component/index/formIndex/index'), + changeButton: routePage('pages/component/input/button/index/index').changePage, + changeCheckbox: routePage('pages/component/input/checkbox/index/index').changePage, + changeRadio: routePage('pages/component/input/radio/index/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js index e933b2d2ae9f9907a3b9b348996b336b7b0276f0..a36003223dfcb8e641b2d5dfaeb6169b2e6f4b21 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/attr/attr.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { data: { - showAttr: "false", - name: "show", + showAttr: 'false', + name: 'show', status: true }, - ...goPage("pages/component/input/radio/index/index"), + ...goPage('pages/component/input/radio/index/index'), changeShow: function() { this.status = !this.status; }, @@ -28,9 +28,9 @@ export default { }, changeChecked: function(e) { if (e.checked) { - this.show = "true"; + this.show = 'true'; } else { - this.show = "false"; + this.show = 'false'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js index 885422c467307889c3cefa7b4e9e73298f117fbe..9571a5be322838958cca338c1154fffd6a01972f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/event/event.js @@ -12,24 +12,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { data: { - name: "点击或长按", - checked: "触发change", + name: '点击或长按', + checked: '触发change', show: true }, - ...goPage("pages/component/input/radio/index/index"), + ...goPage('pages/component/input/radio/index/index'), clickEvent() { - this.name = "点击事件触发"; + this.name = '点击事件触发'; }, longpressEvent() { - this.name = "长按事件触发"; + this.name = '长按事件触发'; }, swipeEvent(e) { - this.name = "swipe方向：" + e.direction; + this.name = 'swipe方向：' + e.direction; }, changeEvent(e) { - this.checked = "change触发"; + this.checked = 'change触发'; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js index eba22c702f25b8a579b5356acbe9e1eef2e51465..bb1e4dd28e46f0af2a4be6ab2f0d2b57a4d36253 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/index/index.js @@ -12,10 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - goAttrs: routePage("pages/component/input/radio/attr/attr").changePage, - goStyle: routePage("pages/component/input/radio/style/style").changePage, - goEvent: routePage("pages/component/input/radio/event/event").changePage, - ...backPage("pages/component/input/index/index") + goAttrs: routePage('pages/component/input/radio/attr/attr').changePage, + goStyle: routePage('pages/component/input/radio/style/style').changePage, + goEvent: routePage('pages/component/input/radio/event/event').changePage, + ...backPage('pages/component/input/index/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js index 1ea73f584d91612e64f783ddadf4b6242287f723..932150ba36b9dafd696a28594f91af304ade4574 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/input/radio/style/style.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { - ...goPage("pages/component/input/radio/index/index") + ...goPage('pages/component/input/radio/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.js index 8d30558c651730a290be5d241997a1c1784d1b89..42f26fc5d19d13ccd5a5ef6427852bede00264b3 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/index/index.js @@ -12,9 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/containerIndex/index"), - changePage1: routePage("pages/component/list/list/index/index").changePage, - changePage2: routePage("pages/component/list/list-item/index/index").changePage + ...backPage('pages/component/index/containerIndex/index'), + changePage1: routePage('pages/component/list/list/index/index').changePage, + changePage2: routePage('pages/component/list/list-item/index/index').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js index 805ba3e96c302a3288cf6c20b93f4d5c67dce162..1721c2a469bef4893c777bf4db8e4befb10670be 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/index/index.js @@ -12,10 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/index/index"), - changePage1: routePage("pages/component/list/list-item/indexAttr/index").changePage, - changePage2: routePage("pages/component/list/list-item/indexCommonStyle/index").changePage, - changePage4: routePage("pages/component/list/list-item/indexEvent/index").changePage + ...backPage('pages/component/list/index/index'), + changePage1: routePage('pages/component/list/list-item/indexAttr/index').changePage, + changePage2: routePage('pages/component/list/list-item/indexCommonStyle/index').changePage, + changePage4: routePage('pages/component/list/list-item/indexEvent/index').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js index 5318f51c08a8e6df29a333705c53bc2ecd5f9d6c..7994ecd268e4cc65b7c954683cbe1b8481d767a1 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexAttr/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list-item/index/index"), - changePage1: routePage("pages/component/list/list-item/item8/item8").changePage, - changePage2: routePage("pages/component/list/list-item/item9/item9").changePage, - changePage3: routePage("pages/component/list/list-item/item12/item12").changePage + ...backPage('pages/component/list/list-item/index/index'), + changePage1: routePage('pages/component/list/list-item/item8/item8').changePage, + changePage2: routePage('pages/component/list/list-item/item9/item9').changePage, + changePage3: routePage('pages/component/list/list-item/item12/item12').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js index 71263468fa9b221d59f50735121e3aee0c8330b2..339cdd64225c56be61dc69ad8bde6780b8714aaf 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexCommonStyle/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list-item/index/index"), - changePage1: routePage("pages/component/list/list-item/item3/item3").changePage, - changePage2: routePage("pages/component/list/list-item/item5/item5").changePage, - changePage3: routePage("pages/component/list/list-item/item11/item11").changePage + ...backPage('pages/component/list/list-item/index/index'), + changePage1: routePage('pages/component/list/list-item/item3/item3').changePage, + changePage2: routePage('pages/component/list/list-item/item5/item5').changePage, + changePage3: routePage('pages/component/list/list-item/item11/item11').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js index fc24e2837bc39336e714716917aa6e048aed0bc3..ecf159739b186d88e553dd09c51a05d70e7a1e11 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list-item/index/index"), - changePage1: routePage("pages/component/list/list-item/item1/item1").changePage + ...backPage('pages/component/list/list-item/index/index'), + changePage1: routePage('pages/component/list/list-item/item1/item1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js index 67b16cfa217859b0754898082e82f74c53696a40..3fa480e15f4f3279dbf51e552a4855f8455689e7 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item1/item1.js @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "" + text1: '' }, - ...backPage("pages/component/list/list-item/indexEvent/index"), - changePage1: routePage("pages/component/list/list-item/item1/item1").changePage, + ...backPage('pages/component/list/list-item/indexEvent/index'), + changePage1: routePage('pages/component/list/list-item/item1/item1').changePage, clickFunc: function() { - this.text1 = "点击事件被触发"; + this.text1 = '点击事件被触发'; }, longPressFunc: function() { - this.text1 = "长按事件被触发"; + this.text1 = '长按事件被触发'; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js index 30d86e81f7ba09a847ca5d3331a52cc8294ac2e0..a7edf0c946180fe34a4600ac3526936e439b72e6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item11/item11.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -var displayData = ["flex", "none"]; +import { backPage, routePage } from '../../../../../common/js/general'; +let displayData = ['flex', 'none']; export default { data: { - text1: "item-abcd设置display，点击按钮切换display", + text1: 'item-abcd设置display，点击按钮切换display', status: true, displayValue: displayData[0] }, changeDisplay: function() { - if (this.status == true) { + if (this.status === true) { this.displayValue = displayData[1]; this.status = false; } else { @@ -29,5 +29,5 @@ export default { this.status = true; } }, - ...backPage("pages/component/list/list-item/indexCommonStyle/index") + ...backPage('pages/component/list/list-item/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js index 64843f7a6b86dbd326dfb67f69c57194ccd2332a..8c1ee0ee20187c52c4ce94ee1318bba445eee6be 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item12/item12.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - listData: ["a", "b", "c", "d"], - text1: "for类型list-item包含4个item" + listData: ['a', 'b', 'c', 'd'], + text1: 'for类型list-item包含4个item' }, - ...backPage("pages/component/list/list-item/indexAttr/index") + ...backPage('pages/component/list/list-item/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js index 213c051b83f94ce63bdffa616000e16f0ddba0d3..e234bb7fd4c3836c7e3b6cbb9ae6edcd318ebd4a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item3/item3.js @@ -12,11 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "上面list有3个item", - text2: "item背景和宽高已设置" + text1: '上面list有3个item', + text2: 'item背景和宽高已设置' }, - ...backPage("pages/component/list/list-item/indexCommonStyle/index") + ...backPage('pages/component/list/list-item/indexCommonStyle/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js index 5a5622feb921c084109ed08f16b636162b02b2ec..0a9487bffa9e676b0e2ec36ef254b256217d1901 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item5/item5.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "list-item的border边框和padding内边距" + text1: 'list-item的border边框和padding内边距' }, - ...backPage("pages/component/list/list-item/indexCommonStyle/index") + ...backPage('pages/component/list/list-item/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js index eeec64bdcbebd51413cb9c09c3ae93a101b26937..c12e6ff8e487c7afb024bb67d1365bbd8b49495d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item8/item8.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/list"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/list'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, - ...backPage("pages/component/list/list-item/indexAttr/index"), + ...backPage('pages/component/list/list-item/indexAttr/index'), changeStatus: changeStatus -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js index d4432ef5e3562d324731153c675695413ea36f02..22bc78837b3f6795e3257a2e467bc389be10f213 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list-item/item9/item9.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/list"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/list'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, changeStatus: changeStatus, - ...backPage("pages/component/list/list-item/indexAttr/index") + ...backPage('pages/component/list/list-item/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js index 3574e2b981bac7dba69389690d132611034509a8..95a13a2a3270edf38b9d7fab14c59fb94d21dd7a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/index/index.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/index/index"), - changePage1: routePage("pages/component/list/list/indexAttr/index").changePage, - changePage2: routePage("pages/component/list/list/indexCommonStyle/index").changePage, - changePage3: routePage("pages/component/list/list/indexSpecStyle/index").changePage, - changePage4: routePage("pages/component/list/list/indexEvent/index").changePage, - changePage5: routePage("pages/component/list/list/indexOperation/index").changePage + ...backPage('pages/component/list/index/index'), + changePage1: routePage('pages/component/list/list/indexAttr/index').changePage, + changePage2: routePage('pages/component/list/list/indexCommonStyle/index').changePage, + changePage3: routePage('pages/component/list/list/indexSpecStyle/index').changePage, + changePage4: routePage('pages/component/list/list/indexEvent/index').changePage, + changePage5: routePage('pages/component/list/list/indexOperation/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js index a3ef22d713d454c2740266dda3cea7b1731e668e..62e81be66ff0ef06b67ed7bcf8a3d76fce323610 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexAttr/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list/index/index"), - changePage1: routePage("pages/component/list/list/list8/list8").changePage, - changePage2: routePage("pages/component/list/list/list9/list9").changePage, - changePage3: routePage("pages/component/list/list/list12/list12").changePage + ...backPage('pages/component/list/list/index/index'), + changePage1: routePage('pages/component/list/list/list8/list8').changePage, + changePage2: routePage('pages/component/list/list/list9/list9').changePage, + changePage3: routePage('pages/component/list/list/list12/list12').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js index aeef1c33020cbc227503c20ca07c01a88c0461b3..214d80614380cd022424442144b966474113d25f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexCommonStyle/index.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list/index/index"), - changePage1: routePage("pages/component/list/list/list3/list3").changePage, - changePage2: routePage("pages/component/list/list/list4/list4").changePage, - changePage3: routePage("pages/component/list/list/list5/list5").changePage, - changePage4: routePage("pages/component/list/list/list10/list10").changePage, - changePage5: routePage("pages/component/list/list/list11/list11").changePage + ...backPage('pages/component/list/list/index/index'), + changePage1: routePage('pages/component/list/list/list3/list3').changePage, + changePage2: routePage('pages/component/list/list/list4/list4').changePage, + changePage3: routePage('pages/component/list/list/list5/list5').changePage, + changePage4: routePage('pages/component/list/list/list10/list10').changePage, + changePage5: routePage('pages/component/list/list/list11/list11').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js index 20a0f073f1db69ab22202c34774e5e14cee28b90..c7d03e28a5ba0f915b92d3f3517f0cabe00e93ce 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexEvent/index.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list/index/index"), - changePage1: routePage("pages/component/list/list/list1/list1").changePage, - changePage2: routePage("pages/component/list/list/list2/list2").changePage + ...backPage('pages/component/list/list/index/index'), + changePage1: routePage('pages/component/list/list/list1/list1').changePage, + changePage2: routePage('pages/component/list/list/list2/list2').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js index 928ed8bc7fbb299ddd68e4b2148049d40e399478..091138999a029a70524a1b9230f8cb4be52f3301 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexOperation/index.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list/index/index"), - changePage1: routePage("pages/component/list/list/list7/list7").changePage, - changePage2: routePage("pages/component/list/list/list13/list13").changePage + ...backPage('pages/component/list/list/index/index'), + changePage1: routePage('pages/component/list/list/list7/list7').changePage, + changePage2: routePage('pages/component/list/list/list13/list13').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js index b92445aecf43138ded62dcdde7d58bd3521c9e33..f668bdabc737e2d7930703ac915f022221b88e5f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/indexSpecStyle/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/list/list/index/index"), - changePage1: routePage("pages/component/list/list/list6/list6").changePage + ...backPage('pages/component/list/list/index/index'), + changePage1: routePage('pages/component/list/list/list6/list6').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js index 19cefaa8b99db6cf87906b886c1f8f81113af5e1..69fbae74458fa80ac8e4d6c6a4b9fdbe3e1e850b 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list1/list1.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "" + text1: '' }, - ...backPage("pages/component/list/list/indexEvent/index"), + ...backPage('pages/component/list/list/indexEvent/index'), clickFunc: function() { - this.text1 = "点击事件已触发"; + this.text1 = '点击事件已触发'; }, listswipe: function(e) { - this.text1 = "swipe方向：" + e.direction; + this.text1 = 'swipe方向：' + e.direction; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js index 57f1efdc10cfd2cc6a34f70b0b6b125693e1d88f..688fd91805f658eee144925668bd4ce9f6f5e6c2 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list10/list10.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "上面绿块为list", - text2: "margin已设置", - text3: "宽高已设置" + text1: '上面绿块为list', + text2: 'margin已设置', + text3: '宽高已设置' }, - ...backPage("pages/component/list/list/indexCommonStyle/index"), + ...backPage('pages/component/list/list/indexCommonStyle/index'), changeStatus: function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js index 51fa2acb16e68f7cf53ec41e726381c135ecdd9f..0e241d82bc2ca023b102e2407bff8056d8589f83 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list11/list11.js @@ -12,20 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "上面绿块为list", - text2: "点击按钮切换display", - text3: "支持flex/none", - display: "flex" + text1: '上面绿块为list', + text2: '点击按钮切换display', + text3: '支持flex/none', + display: 'flex' }, - ...backPage("pages/component/list/list/indexCommonStyle/index"), + ...backPage('pages/component/list/list/indexCommonStyle/index'), changeDisplay: function() { - if (this.display === "flex") { - this.display = "none"; + if (this.display === 'flex') { + this.display = 'none'; } else { - this.display = "flex"; + this.display = 'flex'; } } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js index d957428b988f90df66dfb32b57e080b4d69471f1..efb080aeece1b58725fcbc573ddbc75379803e22 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list12/list12.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - listData: ["a", "b", "c", "d"], - text1: "for类型list包含4个list" + listData: ['a', 'b', 'c', 'd'], + text1: 'for类型list包含4个list' }, - ...backPage("pages/component/list/list/indexAttr/index") + ...backPage('pages/component/list/list/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js index 104a98d6aa9c936fa01b098e23da4d668ac7e448..d28a36cb3110d60970c4dac2b77b10ad63f88d4a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list13/list13.js @@ -12,33 +12,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -var router = require("@system.router"); +let router = require('@system.router'); module.exports = { data: { - listData: ["a", "b", "c", "d", "e", "f", "g", "h"] + listData: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'] }, backMain: function() { - router.replace({ uri: "pages/index/index" }); + router.replace({ uri: 'pages/index/index' }); }, backSuperior: function() { - router.replace({ uri: "pages/component/list/list/indexOperation/index" }); + router.replace({ uri: 'pages/component/list/list/indexOperation/index' }); }, listClick() { - router.replace({ uri: "pages/component/list/list/list13/list13" }); - console.log("list onclick is triggered"); + router.replace({ uri: 'pages/component/list/list/list13/list13' }); + console.log('list onclick is triggered'); }, scrollEnd(endState, endComponentIndex) { - console.log("list onscrollend is triggered, end component index=" + endComponentIndex); - console.log("list onscrollend is triggered, state=" + endState); + console.log('list onscrollend is triggered, end component index=' + endComponentIndex); + console.log('list onscrollend is triggered, state=' + endState); }, clickscrollTo() { this.$refs.listObj.scrollTo({ index: 2 }); }, onInit() { - console.log("on init called..."); + console.log('on init called...'); }, onShow() { this.$refs.listObj.scrollTo({ index: 3 }); - console.log("on Ready called..."); + console.log('on Ready called...'); } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.css b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.css new file mode 100644 index 0000000000000000000000000000000000000000..3acc4b289a9e0d55054261811db1b4074aae4e33 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.css @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2024 Huawei Device 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 10px; + width: 454px; + height: 454px; +} + +.text-container { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + left: 0px; + top: 40px; + width: 454px; + height: 45px; +} + +.operate-container { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + left: 0px; + top: 40px; + width: 454px; + height: 45px; +} + +.todo-wraper { + left: 10px; + right: 5px; + width: 400px; + height: 250px; + flex-direction: column; + text-align: left; + border-width: 2; + border-color: chartreuse; + border-radius: 2px; + background-color: blue; + divider-color: red; + padding-top: 10px; + opacity: 0.9; + display: flex; + scrolleffect: fade; + indexer: true; + indexercircle: false; + indexerbubble: true; +} + +.todo-item { + width: 454px; + height: 80px; + font-size: 30px; + flex-direction: column; + padding: 1px; + border-width: 2; + color: crimson; + letter-spacing: 1px; + text-align: left; + scrollbar: on; +} + +.todo-title { + width: 454px; + height: 40px; + font-size: 30px; + flex-direction: column; + text-align: left; + color: yellow; + letter-spacing: 1px; + padding-left: 150px; +} + +.todo-content { + width: 454px; + height: 40px; + font-size: 30px; + flex-direction: column; + text-align: left; + color: yellow; + letter-spacing: 1px; + padding-left: 30px; +} + +.goto-end { + width: 200px; + height: 40px; + text-align: left; + font-size: 30px; + border-width: 2px; + border-radius: 2px; + background-color: aliceblue; + color: crimson; + margin-top: 2px; +} + +.other_func { + width: 200px; + height: 40px; + text-align: center; + font-size: 30px; + border-width: 2px; + border-radius: 2px; + background-color: aliceblue; + color: crimson; + margin-top: 2px; +} + +.goto-front { + width: 400px; + height: 40px; + top: 380px; + text-align: center; + font-size: 30px; + border-width: 2px; + border-radius: 2px; + background-color: aliceblue; + color: crimson; +} + +.goto-special { + width: 200px; + height: 40px; + text-align: center; + font-size: 30px; + border-width: 2px; + border-radius: 2px; + background-color: aliceblue; + color: crimson; +} + +.delete-all { + width: 200px; + height: 40px; + text-align: center; + font-size: 30px; + border-width: 2px; + border-radius: 2px; + background-color: aliceblue; + color: crimson; +} + +.add-delete { + width: 200px; + height: 40px; + text-align: center; + font-size: 30px; + border-width: 2px; + border-radius: 2px; + background-color: aliceblue; + color: crimson; +} \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..c2ebffed94af8b3244ae3295929e2400386eaf93 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.hml @@ -0,0 +1,56 @@ + + +
+
+ + {{goToEnd}} + + + {{changeBG}} + +
+
+ + {{goToSpecial}} + + + {{deleteAll}} + +
+
+ + {{addItem}} + + + {{deleteItem}} + +
+ + + + {{$item.title}} + + + {{$item.date}} + + + + + {{goToFront}} + +
diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.js new file mode 100644 index 0000000000000000000000000000000000000000..fcaa8674298c668de5b4ce7c34dd70230539adf4 --- /dev/null +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list14/index.js @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2024 Huawei Device 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. + */ + +const COLOR_RED = '#FF0000'; +const COLOR_ORANGE = '#FFA500'; +const COLOR_GREEN = '#00fa9a'; +const COLOR_BLACK = '#000000'; +const COLOR_BLUE = '#0000FF'; +const COLOR_YELLOW = ' #FFFF00'; + +const MAX_ITEM_NUMBER = 20; +const GO_TO_SPECIAL_ITEM = 3; +export default { + data: { + planList: [], + goToEnd: '', + goToFront: '', + goToSpecial: '', + inputText: '', + addItem: '', + deleteAll: '', + changeBG: '', + backGroundColor: '', + }, + onInit() { + this.onInitList(); + this.goToEnd = 'to the end'; + this.goToFront = 'to front'; + this.goToSpecial = 'go to ' + GO_TO_SPECIAL_ITEM; + this.deleteAll = 'deleteAll'; + this.addItem = 'addItem'; + this.deleteItem = 'deleteItem'; + this.changeBG = 'change bg'; + this.backGroundColor = COLOR_YELLOW; + + }, + onInitList() { + for (let i = 0; i < MAX_ITEM_NUMBER; i++) { + let data = {id: i, + title: `plan-${i}`, + date: this.getCurrentDateTime(), + color: COLOR_ORANGE, + borderColor: COLOR_BLACK, + backgroundColor: COLOR_BLUE, + }; + this.planList.push(data); + } + }, + onGoToEnd() { + console.log('onGoToEnd'); + if (this.planList.length <= 0) { + console.log('Element is empty'); + return; + } + let end = this.planList.length - 1; + this.$refs.listObj.scrollTo({ index: end}); + }, + onGoFront() { + console.log('onGoFront'); + this.$refs.listObj.scrollTo({ index: 0 }); + }, + onGoSpecial(item) { + console.log('onGoSpecial'); + let length = this.planList.length - 1; + let index = item; + if (length < item) { + index = 0; + } + this.$refs.listObj.scrollTo({ index: index }); + }, + onAddItem() { + console.log('onAddItem'); + let length = this.planList.length; + let data = { id: length, + title: 'plan-addItem', + date: '2021-12-31 10:00:00', + color: COLOR_ORANGE}; + + data.date = this.getCurrentDateTime(); + this.planList.push(data); + this.onGoSpecial(this.planList.length - 1); + }, + onDeleteItem() { + console.log('onDeleteItem'); + if (this.planList.length <= 0) { + console.log('Element is empty'); + return; + } + this.planList.pop(); + if (this.planList.length > 0) { + this.onGoSpecial(this.planList.length - 1); + } + }, + onSelectItem(item) { + console.log('onSelectItem=' + item); + this.planList[item].title = 'select'; + this.planList[item].color = COLOR_RED; + this.planList[item].backgroundColor = COLOR_YELLOW; + this.planList[item].date = this.getCurrentDateTime(); + this.onInitItem(item); + }, + onLongPressItem(item) { + console.log('onLongPressItem = ' + item); + this.planList[item].title = 'onLongPress'; + this.planList[item].color = COLOR_GREEN; + this.onInitItem(item); + }, + onDragItem(item) { + console.log('onDragItem = ' + item); + }, + onDeleteAll() { + console.log('onDeleteAll'); + while (this.planList.length > 0) { + this.planList.pop(); + } + }, + onChangeBackgroundColor() { + console.log('onChangeBackgroundColor'); + if (this.backGroundColor === COLOR_BLUE) { + this.backGroundColor = COLOR_YELLOW; + } else if (this.backGroundColor === COLOR_YELLOW) { + this.backGroundColor = COLOR_GREEN; + } else if (this.backGroundColor === COLOR_GREEN) { + this.backGroundColor = COLOR_ORANGE; + } else { + this.backGroundColor = COLOR_BLUE; + } + }, + getCurrentDateTime() { + let now = new Date(); + let year = now.getFullYear(); + let month = now.getMonth() + 1; + let day = now.getDate(); + let hours = now.getHours(); + let minutes = now.getMinutes(); + let seconds = now.getSeconds(); + + month = (month < 10 ? '0' : '') + month; + day = (day < 10 ? '0' : '') + day; + hours = (hours < 10 ? '0' : '') + hours; + minutes = (minutes < 10 ? '0' : '') + minutes; + seconds = (seconds < 10 ? '0' : '') + seconds; + + return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds; + }, + onInitItem(item) { + for (let i = 0; i < this.planList.length; i++) { + if (this.planList[i].id === item) { + continue; + } + + this.planList[i].title = `plan-${i}`; + this.planList[i].color = COLOR_ORANGE; + } + } +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js index 399542900a1348924539d7dc885eb9162b817d50..acd73dce4d3f1b7ec15e110ef5979c05d95d7dd0 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list2/list2.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "scrollend未触发" + text1: 'scrollend未触发' }, - ...backPage("pages/component/list/list/indexEvent/index"), + ...backPage('pages/component/list/list/indexEvent/index'), scrollendFunc: function() { - this.text1 = "scrollend已触发"; + this.text1 = 'scrollend已触发'; } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js index e0065b912aee0f766cd49dd0b3d84458f05e7d35..8443b2cb671ad2e154edc02f68e6af6b41b03625 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list3/list3.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "上面绿块为list", - text2: "背景距离已设置" + text1: '上面绿块为list', + text2: '背景距离已设置' }, - ...backPage("pages/component/list/list/indexCommonStyle/index") + ...backPage('pages/component/list/list/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js index f87f2ba06c6a2c67b27122ad1170927f24bc91fb..13b57fa3833692e80a327f5ce555048b5aa05461 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list4/list4.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "上面绿块为list", - text2: "margin已设置", - text3: "宽高已设置" + text1: '上面绿块为list', + text2: 'margin已设置', + text3: '宽高已设置' }, - ...backPage("pages/component/list/list/indexCommonStyle/index") + ...backPage('pages/component/list/list/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js index 2fba3be0e5bb1d90327ebfe6a482a38600ee35f1..5f0978e3a76896a4d125566fe377cb37ea0c92b3 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list5/list5.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "内边距和边框" + text1: '内边距和边框' }, - ...backPage("pages/component/list/list/indexCommonStyle/index") + ...backPage('pages/component/list/list/indexCommonStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js index 1e4c4c5fd2e247cd165b0e619cd35accd3ee8d76..f8edc2192f1ec9dc5fcde0fcbc37263d975fcc28 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list6/list6.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "div方块横向排列" + text1: 'div方块横向排列' }, - ...backPage("pages/component/list/list/indexSpecStyle/index") + ...backPage('pages/component/list/list/indexSpecStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js index e21279b17059bae27123645bc4baa7ac41b4f373..2ecb41f320dfe26b6ce695fcc9530ca7d827cc1c 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list7/list7.js @@ -12,30 +12,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - listData: ["text组件b", "text组件c", "text组件d"] + listData: ['text组件b', 'text组件c', 'text组件d'] }, - ...backPage("pages/component/list/list/indexOperation/index"), + ...backPage('pages/component/list/list/indexOperation/index'), pushItem: function() { - console.log("push an item."); - this.listData.push("text组件z"); + console.log('push an item.'); + this.listData.push('text组件z'); }, popItem: function() { - console.log("pop an item."); + console.log('pop an item.'); this.listData.pop(); }, shiftItem: function() { - console.log("shift an item."); + console.log('shift an item.'); this.listData.shift(); }, unshiftItem: function() { - console.log("unshift an item."); - this.listData.unshift("text组件a"); + console.log('unshift an item.'); + this.listData.unshift('text组件a'); }, spliceItem: function() { - console.log("splice items."); - this.listData.splice(0, 1, "text组件x", "text组件y"); + console.log('splice items.'); + this.listData.splice(0, 1, 'text组件x', 'text组件y'); } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js index 4a7332ac84786512ae7422f764663eb8db48ae90..281b8d8598c01b7151e80ba7007276092713935e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list8/list8.js @@ -12,13 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/list"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/list'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, - ...backPage("pages/component/list/list/indexAttr/index"), + ...backPage('pages/component/list/list/indexAttr/index'), changeStatus: changeStatus }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js index 3f83ce54271f1b2fd9b9199b08ceec743c3d120f..131d5c4c9f981ca28c39cbab0178c6d696d21242 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/list/list/list9/list9.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/list"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/list'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, changeStatus: changeStatus, - ...backPage("pages/component/list/list/indexAttr/index") + ...backPage('pages/component/list/list/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js index 061c2afe23ab1340ff2b66429338d1607c7f6436..6dba13d02014dd3a0909fd712bff50b6ef7b16cb 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/attr/attr.js @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; -import { changeStatus, changeIfStatus } from "../../../../common/js/marquee"; +import { goPage, routePage } from '../../../../common/js/general'; +import { changeStatus, changeIfStatus } from '../../../../common/js/marquee'; export default { data: { status: true, ifstatus: true, - marqueefor: ["1.marquee测试for标签，abcdefg", "2.marquee测试for标签，abcdefg"] + marqueefor: ['1.marquee测试for标签，abcdefg', '2.marquee测试for标签，abcdefg'] }, - ...goPage("pages/component/marquee/index/index"), + ...goPage('pages/component/marquee/index/index'), changeStatus: changeStatus, changeIfStatus: changeIfStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js index e5eb79405ce7442ecd9c52993dcd29a6af6af528..5c59c39d0aea30888ee322f36811086967b8c90a 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/commonStyle/commonStyle.js @@ -12,20 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { - displayVal: "flex", + displayVal: 'flex', flag: true }, changeDisplay() { if (this.flag) { - this.displayVal = "none"; + this.displayVal = 'none'; this.flag = false; } else { - this.displayVal = "flex"; + this.displayVal = 'flex'; this.flag = true; } }, - ...goPage("pages/component/marquee/index/index") + ...goPage('pages/component/marquee/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js index 47e913455feb828d1c975be994b72499c7b3e4f8..911858e5140bdf1e8e892d555fa42ab9eac9080b 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/event/event.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { - text: "点击/长按/滑动" + text: '点击/长按/滑动' }, - ...goPage("pages/component/marquee/index/index"), + ...goPage('pages/component/marquee/index/index'), clickEvent(e) { - this.text = "点击已触发"; + this.text = '点击已触发'; }, longpressEvent() { - this.text = "长按已触发"; + this.text = '长按已触发'; }, swipeEvent(e) { - this.text = "swipe方向：" + e.direction; + this.text = 'swipe方向：' + e.direction; } -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js index 6febea5fab4a55534a10f82c5a144c1f93545c60..640f4ca93cfae7507c884ca386f02eedd3062dc3 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/index/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - changePage1: routePage("pages/component/marquee/attr/attr").changePage, - changePage2: routePage("pages/component/marquee/commonStyle/commonStyle").changePage, - changePage3: routePage("pages/component/marquee/specStyle/specStyle").changePage, - changePage4: routePage("pages/component/marquee/event/event").changePage, - ...backPage("pages/component/index/baseIndex/index") + changePage1: routePage('pages/component/marquee/attr/attr').changePage, + changePage2: routePage('pages/component/marquee/commonStyle/commonStyle').changePage, + changePage3: routePage('pages/component/marquee/specStyle/specStyle').changePage, + changePage4: routePage('pages/component/marquee/event/event').changePage, + ...backPage('pages/component/index/baseIndex/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js index 109b3badc3d9ceecef2734a980bdc123554d1211..944b28f195e0b70cf267c1a44da5466f4d92aeee 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/marquee/specStyle/specStyle.js @@ -12,7 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/marquee/index/index") + ...goPage('pages/component/marquee/index/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js index 60e70d7e90180c0fc57a3d9bee30e116f5d526ae..b9ac2239b5f06b4392c39c265d748f6d0c44176e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/index/index.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/formIndex/index"), - changeTextPicker: routePage("pages/component/picker_view/text_picker/index/index").changePage, - changeTimePicker: routePage("pages/component/picker_view/time_picker/index/index").changePage + ...backPage('pages/component/index/formIndex/index'), + changeTextPicker: routePage('pages/component/picker_view/text_picker/index/index').changePage, + changeTimePicker: routePage('pages/component/picker_view/time_picker/index/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js index ae3d297eb58c36d6104e4837dafa8c5565fc021e..024e9f262316ea9bec75f0b92e3cd2b3acf91095 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/index/index"), - changePage1: routePage("pages/component/picker_view/text_picker/indexAttr/index").changePage, - changePage2: routePage("pages/component/picker_view/text_picker/indexStyle/index").changePage, - changePage3: routePage("pages/component/picker_view/text_picker/indexEvent/index").changePage + ...backPage('pages/component/picker_view/index/index'), + changePage1: routePage('pages/component/picker_view/text_picker/indexAttr/index').changePage, + changePage2: routePage('pages/component/picker_view/text_picker/indexStyle/index').changePage, + changePage3: routePage('pages/component/picker_view/text_picker/indexEvent/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js index 91b1b532094688dbeddc16c2265408f13962ecde..24d98f3ac45ad19203e4ef970fa104d32490d10e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexAttr/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/text_picker/index/index"), - changePage1: routePage("pages/component/picker_view/text_picker/text_picker6/text_picker6").changePage, - changePage2: routePage("pages/component/picker_view/text_picker/text_picker5/text_picker5").changePage, - change2If: routePage("pages/component/picker_view/text_picker/text_picker7/text_picker7").changePage, - change2For: routePage("pages/component/picker_view/text_picker/text_picker8/text_picker8").changePage + ...backPage('pages/component/picker_view/text_picker/index/index'), + changePage1: routePage('pages/component/picker_view/text_picker/text_picker6/text_picker6').changePage, + changePage2: routePage('pages/component/picker_view/text_picker/text_picker5/text_picker5').changePage, + change2If: routePage('pages/component/picker_view/text_picker/text_picker7/text_picker7').changePage, + change2For: routePage('pages/component/picker_view/text_picker/text_picker8/text_picker8').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js index c94f7ea9eb98e57568efd91d067554c31ea6ccd2..88bef773649e801e35f06167b1f025253d490dc2 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/text_picker/index/index"), - changePage1: routePage("pages/component/picker_view/text_picker/text_picker1/text_picker1").changePage + ...backPage('pages/component/picker_view/text_picker/index/index'), + changePage1: routePage('pages/component/picker_view/text_picker/text_picker1/text_picker1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js index 4815ddf31e9f4065a11cd2e86956c25bc7631d1b..493fe4e92fc8a9cb19002c12b7141e90374f1b58 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/indexStyle/index.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/text_picker/index/index"), - changePage1: routePage("pages/component/picker_view/text_picker/text_picker2/text_picker2").changePage, - changePage2: routePage("pages/component/picker_view/text_picker/text_picker3/text_picker3").changePage, - changePage3: routePage("pages/component/picker_view/text_picker/text_picker4/text_picker4").changePage, - change2Style: routePage("pages/component/picker_view/text_picker/text_picker9/text_picker9").changePage, - change2Display: routePage("pages/component/picker_view/text_picker/text_picker10/text_picker10").changePage + ...backPage('pages/component/picker_view/text_picker/index/index'), + changePage1: routePage('pages/component/picker_view/text_picker/text_picker2/text_picker2').changePage, + changePage2: routePage('pages/component/picker_view/text_picker/text_picker3/text_picker3').changePage, + changePage3: routePage('pages/component/picker_view/text_picker/text_picker4/text_picker4').changePage, + change2Style: routePage('pages/component/picker_view/text_picker/text_picker9/text_picker9').changePage, + change2Display: routePage('pages/component/picker_view/text_picker/text_picker10/text_picker10').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js index 98d05e70fbae425fdfff7557e25e684db9300994..9427652da338360f94d494f2c25d33ca6d1b7d8f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker1/text_picker1.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { text1: 0, - text2: "a", - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] + text2: 'a', + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'] }, - ...backPage("pages/component/picker_view/text_picker/indexEvent/index"), + ...backPage('pages/component/picker_view/text_picker/indexEvent/index'), getText: function(e1) { this.text1 = e1.newSelected; this.text2 = e1.newValue; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js index b337cc00fc565f366298a28c8b11758414eb0ad0..0daf41f31e791842f5fd75ab8531bae522d6d710 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker10/text_picker10.js @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"], - status: "flex" + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'], + status: 'flex' }, - ...backPage("pages/component/picker_view/text_picker/indexStyle/index"), + ...backPage('pages/component/picker_view/text_picker/indexStyle/index'), changeStatus: function() { - if (this.status === "flex") { - this.status = "none"; + if (this.status === 'flex') { + this.status = 'none'; } else { - this.status = "flex"; + this.status = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js index 907d003c201335bef177d09a69785b02234e2197..8409d6446d9fe9c3afbe99ff65729f87e4ffa9f1 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker2/text_picker2.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170", - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170', + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'] }, - ...backPage("pages/component/picker_view/text_picker/indexStyle/index") + ...backPage('pages/component/picker_view/text_picker/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js index 1a8e33832a1327a2a2126a7dd61c320bf0c4efd0..adb63e8abecf038dd58d01b580d44d1492d457ab 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker3/text_picker3.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "margin左边距85", - text2: "margin上边距10", - text3: "宽高已设置", - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] + text1: 'margin左边距85', + text2: 'margin上边距10', + text3: '宽高已设置', + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'] }, - ...backPage("pages/component/picker_view/text_picker/indexStyle/index") + ...backPage('pages/component/picker_view/text_picker/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js index 1d7c1f1656c05a5a3e3d53b138e77e3c7660ad10..43ad0786450ef973894be4378cbaea11f4f54902 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker4/text_picker4.js @@ -13,10 +13,11 @@ * limitations under the License. */ // text_picker4.js -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'] }, - ...backPage("pages/component/picker_view/text_picker/indexStyle/index") + ...backPage('pages/component/picker_view/text_picker/indexStyle/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js index ada6d52c74d215168ac09606806044319ac84852..71506de71dfbd3a18ecf1cd3a09106d69840fcf4 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker5/text_picker5.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'] }, - ...backPage("pages/component/picker_view/text_picker/indexAttr/index") -}; + ...backPage('pages/component/picker_view/text_picker/indexAttr/index') +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js index 33b3936690fcc2946bdd4ba63218b7f44d957979..1258aa69384f5c440608498ea4c953bef5043ab0 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker6/text_picker6.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/picker_view"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/picker_view'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"], + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'], status: true }, changeStatus: changeStatus, - ...backPage("pages/component/picker_view/text_picker/indexAttr/index") + ...backPage('pages/component/picker_view/text_picker/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js index 6b57721d011c19e6037d37b42e3f419a37b6977b..df42c835c08819924d3727388547877778e9d3a6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker7/text_picker7.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/picker_view"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/picker_view'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"], + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'], status: true }, - ...backPage("pages/component/picker_view/text_picker/indexAttr/index"), + ...backPage('pages/component/picker_view/text_picker/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js index 9f9ad90f757562900641bec4b51952142c42e979..affe75c31bb70be76ade69bdf2ba295f72504126 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker8/text_picker8.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"], + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'], forData: [0, 1, 2] }, - ...backPage("pages/component/picker_view/text_picker/indexAttr/index") + ...backPage('pages/component/picker_view/text_picker/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js index b957d1aad8eeefaa9b05ec8597ffc602eb30c4fc..41fb82b47f57f98c487decfc6e5adbb818d39321 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/text_picker/text_picker9/text_picker9.js @@ -13,10 +13,10 @@ * limitations under the License. */ // text_picker9.js -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - textContent: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"] + textContent: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'] }, - ...backPage("pages/component/picker_view/text_picker/indexStyle/index") -}; + ...backPage('pages/component/picker_view/text_picker/indexStyle/index') +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js index 66db2397e4fe13c5d04fd7f24e2dffa14b3e26cc..83d55e85e2bf190cd9da4a861183608f96f797ed 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/indexAttr/index").changePage, - changePage2: routePage("pages/component/picker_view/time_picker/indexStyle/index").changePage, - changePage3: routePage("pages/component/picker_view/time_picker/indexEvent/index").changePage + ...backPage('pages/component/picker_view/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/indexAttr/index').changePage, + changePage2: routePage('pages/component/picker_view/time_picker/indexStyle/index').changePage, + changePage3: routePage('pages/component/picker_view/time_picker/indexEvent/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js index 72420a45f49f428dc3ab40d60775a1fc5efb7d72..d9916e07690d18c81fd52bcd4d4f765924a97eb3 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexAttr/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/time_picker6/time_picker6").changePage, - changePage2: routePage("pages/component/picker_view/time_picker/time_picker5/time_picker5").changePage, - change2If: routePage("pages/component/picker_view/time_picker/time_picker7/time_picker7").changePage, - change2For: routePage("pages/component/picker_view/time_picker/time_picker8/time_picker8").changePage + ...backPage('pages/component/picker_view/time_picker/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/time_picker6/time_picker6').changePage, + changePage2: routePage('pages/component/picker_view/time_picker/time_picker5/time_picker5').changePage, + change2If: routePage('pages/component/picker_view/time_picker/time_picker7/time_picker7').changePage, + change2For: routePage('pages/component/picker_view/time_picker/time_picker8/time_picker8').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js index 0f2c7f5707611bd7dcfdbcf057d9ccb4ac043f3f..ca734307ee4410d8a43d39241bc9bb0465263acb 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/time_picker1/time_picker1").changePage + ...backPage('pages/component/picker_view/time_picker/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/time_picker1/time_picker1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js index ed3b91c5bfaaefbe44b4c1a64d4b940eca49c57a..5051bdb541ff8f4c6ecfa8266fe2ad4889b414c7 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/indexStyle/index.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/index/index"), - changePage1: routePage("pages/component/picker_view/time_picker/time_picker2/time_picker2").changePage, - changePage2: routePage("pages/component/picker_view/time_picker/time_picker3/time_picker3").changePage, - changePage3: routePage("pages/component/picker_view/time_picker/time_picker4/time_picker4").changePage, - change2Style: routePage("pages/component/picker_view/time_picker/time_picker9/time_picker9").changePage, - change2Display: routePage("pages/component/picker_view/time_picker/time_picker10/time_picker10").changePage + ...backPage('pages/component/picker_view/time_picker/index/index'), + changePage1: routePage('pages/component/picker_view/time_picker/time_picker2/time_picker2').changePage, + changePage2: routePage('pages/component/picker_view/time_picker/time_picker3/time_picker3').changePage, + changePage3: routePage('pages/component/picker_view/time_picker/time_picker4/time_picker4').changePage, + change2Style: routePage('pages/component/picker_view/time_picker/time_picker9/time_picker9').changePage, + change2Display: routePage('pages/component/picker_view/time_picker/time_picker10/time_picker10').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js index adbe9f8383d6614ea2e37a0c6093cf0d67003e36..c90eaf2552ffda6ca9bccec0623b4dceec9d94ee 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker1/time_picker1.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { time1: -1, time2: -1 }, - ...backPage("pages/component/picker_view/time_picker/indexEvent/index"), + ...backPage('pages/component/picker_view/time_picker/indexEvent/index'), getTime: function(e1) { this.time1 = e1.hour; this.time2 = e1.minute; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js index 0073f49eebfa4e6904a1c00d2edd6bfb623b7781..df33516bd200e216775da70973734f3209acfc6f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker10/time_picker10.js @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - status: "flex" + status: 'flex' }, - ...backPage("pages/component/picker_view/time_picker/indexStyle/index"), + ...backPage('pages/component/picker_view/time_picker/indexStyle/index'), changeStatus: function() { - if (this.status === "flex") { - this.status = "none"; + if (this.status === 'flex') { + this.status = 'none'; } else { - this.status = "flex"; + this.status = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js index 91a9a3536968510647adc0c24dfd31a0ceb204b5..d01f98ced6364275a929a70be16767860a268221 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker2/time_picker2.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170" + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170' }, - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js index 93aee208e480f3bad912d2443ee66a4ffc89ab55..9af8ddaca22a1537fa80aca0577e713909b4fa2c 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker3/time_picker3.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { - text1: "margin左边距85", - text2: "margin上边距10", - text3: "宽高已设置" + text1: 'margin左边距85', + text2: 'margin上边距10', + text3: '宽高已设置' }, - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js index 54879abfe118ca6096beab2d1fb098da55e4108c..df7a76318801de7b5467fb0ac93970a5f2b0ff36 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker4/time_picker4.js @@ -13,7 +13,7 @@ * limitations under the License. */ // time_picker4.js -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js index 7c3e3a2087b5613309a4189227756cd297faf857..90af4188381a365b90c846e64ae36ba0dab37592 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker5/time_picker5.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/indexAttr/index") + ...backPage('pages/component/picker_view/time_picker/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js index 294a8ed01ad60ea94d70916e9df875abf5a8e6fa..cec1999fd610997ea80f946bd65ecf199b106100 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker6/time_picker6.js @@ -13,12 +13,12 @@ * limitations under the License. */ // time_picker6.js -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/picker_view"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/picker_view'; export default { data: { status: true }, - ...backPage("pages/component/picker_view/time_picker/indexAttr/index"), + ...backPage('pages/component/picker_view/time_picker/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js index 0edecbf9e295669cf693bb8f2e939aa7f0f28413..db0f9a1ec247e9257807a722d1fa3e4964b57316 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker7/time_picker7.js @@ -13,12 +13,12 @@ * limitations under the License. */ // time_picker7.js -import { backPage, routePage } from "../../../../../common/js/general"; -import { changeStatus } from "../../../../../common/js/picker_view"; +import { backPage, routePage } from '../../../../../common/js/general'; +import { changeStatus } from '../../../../../common/js/picker_view'; export default { data: { status: true }, - ...backPage("pages/component/picker_view/time_picker/indexAttr/index"), + ...backPage('pages/component/picker_view/time_picker/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js index f7f5a1c235f0c909ad0ce10d802eb0673f03ea28..c37dd51d6e08ff23cb898a51f54a23f340f53ece 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker8/time_picker8.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { data: { status: true, forData: [0, 1] }, - ...backPage("pages/component/picker_view/time_picker/indexAttr/index") -}; + ...backPage('pages/component/picker_view/time_picker/indexAttr/index') +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js index 5c2dd1d710c1a0167c2e598523d1da01bad7c969..c12c0b259c21d48d25fa159cb8a1eac570ccc976 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/picker_view/time_picker/time_picker9/time_picker9.js @@ -13,7 +13,7 @@ * limitations under the License. */ // time_picker9.js -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/picker_view/time_picker/indexStyle/index") + ...backPage('pages/component/picker_view/time_picker/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js index cfb8c7520379ca8cc1a47fcdc8ecfcfff8e5f98a..4833bc779664724a97e8ab7cc5fa1b7f9f678141 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/attr/attr.js @@ -12,23 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -import { changeStatus, changeStatusIf, changeDisplay } from "../../../../../common/js/progress"; +import { goPage, routePage } from '../../../../../common/js/general'; +import { changeStatus, changeStatusIf, changeDisplay } from '../../../../../common/js/progress'; export default { data: { showStatus: true, ifStatus: true, percentAttribute: 20, - loopArray: ["1", "2", "3"], - p01: "p01", - display: "flex" + loopArray: ['1', '2', '3'], + p01: 'p01', + display: 'flex' }, - ...goPage("pages/component/progress/circle/index/index"), + ...goPage('pages/component/progress/circle/index/index'), changePercent() { this.percentAttribute = this.percentAttribute + 10; }, changeStatus() { - if (this.showStatus == true) { + if (this.showStatus === true) { this.showStatus = false; } else { this.showStatus = true; @@ -37,3 +37,4 @@ export default { changeStatusIf: changeStatusIf, changeDisplay: changeDisplay }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js index af6cdce43ba4e452456488aa0374e2adab85b5b1..d29168d98159eda18ac2943d5a82bca4fcddb717 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/event/event.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -import { clickEvent, longpressEvent, swipeEvent } from "../../../../../common/js/progress"; +import { goPage, routePage } from '../../../../../common/js/general'; +import { clickEvent, longpressEvent, swipeEvent } from '../../../../../common/js/progress'; export default { data: { percent: 20, - value: "点击/长按/滑动" + value: '点击/长按/滑动' }, - ...goPage("pages/component/progress/circle/index/index"), + ...goPage('pages/component/progress/circle/index/index'), clickEvent: clickEvent, longpressEvent: longpressEvent, swipeEvent: swipeEvent diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js index 51a76dadae6b57bef7fc96c61d18f81b56e1e17e..85612e8cb3c076be94ff0f4a8a46f5b931ec0572 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/progress/index/index"), - changePage1: routePage("pages/component/progress/circle/attr/attr").changePage, - changePage2: routePage("pages/component/progress/circle/style/style").changePage, - changePage3: routePage("pages/component/progress/circle/event/event").changePage + ...backPage('pages/component/progress/index/index'), + changePage1: routePage('pages/component/progress/circle/attr/attr').changePage, + changePage2: routePage('pages/component/progress/circle/style/style').changePage, + changePage3: routePage('pages/component/progress/circle/event/event').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js index 1f816894c6900d512f22454bcedfc109fb67d208..0aa66bc251ad773dc753cbe41fa80dd1c8c91524 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/circle/style/style.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; +import { goPage, routePage } from '../../../../../common/js/general'; export default { - ...goPage("pages/component/progress/circle/index/index") + ...goPage('pages/component/progress/circle/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js index 3d78ed3cd15a188c791821860b7c01d084d5a644..8f85fe3d27022a33697c11ee9edc807be4b26548 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/attr/attr.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -import { changeStatus, changeStatusIf } from "../../../../../common/js/progress"; +import { goPage, routePage } from '../../../../../common/js/general'; +import { changeStatus, changeStatusIf } from '../../../../../common/js/progress'; export default { data: { - listData: ["a", "b"], + listData: ['a', 'b'], status: true, ifStatus: true, showAttr: 20 }, - ...goPage("pages/component/progress/horizontal/index/index"), + ...goPage('pages/component/progress/horizontal/index/index'), changeStatus: changeStatus, changeStatusIf: changeStatusIf }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js index f799895cfcf3d0f6f01fe3a8e3dee0de1b2be45d..f54269c244c7ae2489e8ebaf8a3db2fcd08a4a45 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/event/event.js @@ -12,15 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -import { clickEvent, longpressEvent, swipeEvent } from "../../../../../common/js/progress"; +import { goPage, routePage } from '../../../../../common/js/general'; +import { clickEvent, longpressEvent, swipeEvent } from '../../../../../common/js/progress'; export default { data: { percent: 20, - value: "点击/长按/滑动" + value: '点击/长按/滑动' }, - ...goPage("pages/component/progress/horizontal/index/index"), + ...goPage('pages/component/progress/horizontal/index/index'), clickEvent: clickEvent, longpressEvent: longpressEvent, swipeEvent: swipeEvent -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js index b8a341597cf6d5e85bf832100b09912853405808..e9f6d2773e496119772b964f56d888b13ba0b06d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../../common/js/general"; +import { backPage, routePage } from '../../../../../common/js/general'; export default { - ...backPage("pages/component/progress/index/index"), - changePage1: routePage("pages/component/progress/horizontal/attr/attr").changePage, - changePage2: routePage("pages/component/progress/horizontal/style/style").changePage, - changePage3: routePage("pages/component/progress/horizontal/event/event").changePage + ...backPage('pages/component/progress/index/index'), + changePage1: routePage('pages/component/progress/horizontal/attr/attr').changePage, + changePage2: routePage('pages/component/progress/horizontal/style/style').changePage, + changePage3: routePage('pages/component/progress/horizontal/event/event').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js index 10d9f59ba0c10f7e9124d33a4b301c1eb21dc6ab..cd798562ac39054abaec56f068549ee8ae29900b 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/horizontal/style/style.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../../common/js/general"; -var displayData = ["flex", "none"]; +import { goPage, routePage } from '../../../../../common/js/general'; +let displayData = ['flex', 'none']; export default { changeDisplay: function() { - if (this.status == true) { + if (this.status === true) { this.displayValue = displayData[1]; this.status = false; } else { @@ -28,5 +28,5 @@ export default { status: true, displayValue: displayData[0] }, - ...goPage("pages/component/progress/horizontal/index/index") + ...goPage('pages/component/progress/horizontal/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.js index 8022d3130995dd84f50ce7dd03fd2c1c094ce941..5cb9f99cd9943beeeea3d794cc9eecd106380101 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/progress/index/index.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/index/baseIndex/index"), - changeCircle: routePage("pages/component/progress/circle/index/index").changePage, - changeHorizontal: routePage("pages/component/progress/horizontal/index/index").changePage + ...goPage('pages/component/index/baseIndex/index'), + changeCircle: routePage('pages/component/progress/circle/index/index').changePage, + changeHorizontal: routePage('pages/component/progress/horizontal/index/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/attr/attr.js index a0c0e60a5af6ffc789b000af7dea4bdb31163d2f..c78913c738240d60214d818e5dab5e506144321f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/attr/attr.js @@ -12,32 +12,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { showStatus: true, ifStatus: true, - display: "flex", - textfor: ["1", "2"], + display: 'flex', + textfor: ['1', '2'], type:'rect', }, - ...goPage("pages/component/qrcode/index/index"), + ...goPage('pages/component/qrcode/index/index'), changeShow() { - if (this.showStatus == true) { + if (this.showStatus === true) { this.showStatus = false; } else { this.showStatus = true; } }, changeStatusIf() { - if (this.ifStatus == true) { + if (this.ifStatus === true) { this.ifStatus = false; } else { this.ifStatus = true; } }, changeType() { - if (this.type == 'rect') { + if (this.type === 'rect') { this.type = 'circle'; } else { this.type = 'rect'; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.hml b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.hml index 9e203e393d7a346f99afec2e43c513c4bdfc47d6..fd0f86392d11dd22f250bf5e3b7fc00638f696aa 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.hml +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.hml @@ -32,7 +32,7 @@ limitations under the License. swipe
- +
diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.js index f64fd031ad12ee3dcae239d50dbbb0417c32244a..baece074e807d3075218abf41575d66085af353f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/event/event.js @@ -12,19 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { - qr_color: "" + qrColor: '' }, - ...goPage("pages/component/qrcode/index/index"), + ...goPage('pages/component/qrcode/index/index'), clickEvent() { - this.qr_color = "#fa8072"; + this.qrColor = '#fa8072'; }, longpressEvent() { - this.qr_color = "#87ceeb"; + this.qrColor = '#87ceeb'; }, swipeEvent(e) { - this.qr_color = '#50bf1f'; + this.qrColor = '#50bf1f'; } }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/index/index.js index 327365fd760bb287fe2d3b7efe737d2e9236a596..c4ea7af0b1b71f2ad9099108013e9c249961d2d9 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/baseIndex/index"), - changePage1: routePage("pages/component/qrcode/attr/attr").changePage, - changePage2: routePage("pages/component/qrcode/style/style").changePage, - changePage3: routePage("pages/component/qrcode/event/event").changePage + ...backPage('pages/component/index/baseIndex/index'), + changePage1: routePage('pages/component/qrcode/attr/attr').changePage, + changePage2: routePage('pages/component/qrcode/style/style').changePage, + changePage3: routePage('pages/component/qrcode/event/event').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/style/style.js index fedb55a33b15fc733eaab079caf6c1a3b28dc69d..572bba978d2a4f4eb75e25cc577f811a88c1678f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/qrcode/style/style.js @@ -13,7 +13,8 @@ * limitations under the License. */ // commonStyle.js -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/qrcode/index/index") + ...goPage('pages/component/qrcode/index/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js index 9240926ea9ffde61bd1288f160ab0517ce068659..5dd1a61131d051f7770bc496b902eea5e969f861 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/attr/attr.js @@ -12,38 +12,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { - slideValue: "值：" + "40", + slideValue: '值：' + '40', status: true, sliders: [1, 2], - isDisplay: "flex", + isDisplay: 'flex', ifStatus: true }, - ...goPage("pages/component/slider/index/index"), + ...goPage('pages/component/slider/index/index'), slideEvent(value) { - this.slideValue = "值：" + value.progress; + this.slideValue = '值：' + value.progress; }, changeStatus: function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; } }, changeIfStatus: function() { - if (this.ifStatus == true) { + if (this.ifStatus === true) { this.ifStatus = false; - } else if (this.ifStatus == false) { + } else if (this.ifStatus === false) { this.ifStatus = true; } }, changeDisplay: function() { - if (this.isDisplay == "flex") { - this.isDisplay = "none"; - } else if (this.isDisplay == "none") { - this.isDisplay = "flex"; + if (this.isDisplay === 'flex') { + this.isDisplay = 'none'; + } else if (this.isDisplay === 'none') { + this.isDisplay = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.js index e5f50e7b0af9ef6880396ef1f6fb99cd5401d8a3..8ed06536613f55e3682c9c977f7af3b15ded4c1d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/event/event.js @@ -12,21 +12,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { - name: "触发click事件", - changename: "触发change事件", - swipename: "触发swipe事件" + name: '触发click事件', + changename: '触发change事件', + swipename: '触发swipe事件' }, - ...goPage("pages/component/slider/index/index"), + ...goPage('pages/component/slider/index/index'), clickEvent() { - this.name = "click被触发"; + this.name = 'click被触发'; }, changeEvent(value) { - this.changename = "change:" + value.progress; + this.changename = 'change:' + value.progress; }, swipeEvent(e) { - this.swipename = "swipe方向:" + e.direction; + this.swipename = 'swipe方向:' + e.direction; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.js index 7ba6534f89636f1b390108d58221c625fbae275d..34b56519126fa9159732ec7f54acfd41d6ef4679 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/index/index.js @@ -12,10 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/formIndex/index"), - changePage1: routePage("pages/component/slider/attr/attr").changePage, - changePage2: routePage("pages/component/slider/style/style").changePage, - changePage3: routePage("pages/component/slider/event/event").changePage + ...backPage('pages/component/index/formIndex/index'), + changePage1: routePage('pages/component/slider/attr/attr').changePage, + changePage2: routePage('pages/component/slider/style/style').changePage, + changePage3: routePage('pages/component/slider/event/event').changePage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.js index f7b7c34539d583f2821d9c85885e9990c0832b5e..146f771a8aff838a5419ba58bbf790f43ed685ca 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/slider/style/style.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/slider/index/index") + ...goPage('pages/component/slider/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.js index b64cdb26f74dfb19b41d7e3e0bc468f0fb528f21..a5ed509291861e65d57cf948d3491467930f0683 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/index/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/containerIndex/index"), - changePage1: routePage("pages/component/stack/indexAttr/index").changePage, - changePage2: routePage("pages/component/stack/indexStyle/index").changePage, - changePage3: routePage("pages/component/stack/indexEvent/index").changePage, - changePage4: routePage("pages/component/stack/indexEffect/index").changePage + ...backPage('pages/component/index/containerIndex/index'), + changePage1: routePage('pages/component/stack/indexAttr/index').changePage, + changePage2: routePage('pages/component/stack/indexStyle/index').changePage, + changePage3: routePage('pages/component/stack/indexEvent/index').changePage, + changePage4: routePage('pages/component/stack/indexEffect/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js index 53da2cd862ffadd2620c4f554788aae5f73b2a03..c11df842a2f552a74a34c3969d30fc782503d4b0 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexAttr/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/stack/index/index"), - changePage1: routePage("pages/component/stack/stack6/stack6").changePage, - changePage2: routePage("pages/component/stack/stack7/stack7").changePage, - changePage3: routePage("pages/component/stack/stack8/stack8").changePage + ...backPage('pages/component/stack/index/index'), + changePage1: routePage('pages/component/stack/stack6/stack6').changePage, + changePage2: routePage('pages/component/stack/stack7/stack7').changePage, + changePage3: routePage('pages/component/stack/stack8/stack8').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js index c1568a8d8c713b8ae446de433133f882563acfc3..a2ef8e80e129956a216dd312b84d8fef12e42cd4 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEffect/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/stack/index/index"), - changePage1: routePage("pages/component/stack/stack5/stack5").changePage + ...backPage('pages/component/stack/index/index'), + changePage1: routePage('pages/component/stack/stack5/stack5').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js index 5900af8ade2faa2edef514f889891141ad4957a2..d8f01b390f415d75a9b35e7ba16524c07104fc8e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/stack/index/index"), - changePage1: routePage("pages/component/stack/stack1/stack1").changePage + ...backPage('pages/component/stack/index/index'), + changePage1: routePage('pages/component/stack/stack1/stack1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js index 9c8b7c9b7fa885a2e7489c618245bf4918ec15bd..ffc3e69bb051ef6275f25d5d8bf977b84035c0bd 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/indexStyle/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/stack/index/index"), - changePage1: routePage("pages/component/stack/stack2/stack2").changePage, - changePage2: routePage("pages/component/stack/stack3/stack3").changePage, - changePage3: routePage("pages/component/stack/stack4/stack4").changePage + ...backPage('pages/component/stack/index/index'), + changePage1: routePage('pages/component/stack/stack2/stack2').changePage, + changePage2: routePage('pages/component/stack/stack3/stack3').changePage, + changePage3: routePage('pages/component/stack/stack4/stack4').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js index 5a1cd55bdd75a5748b9901a7a1191f3f99417e68..06faf8987df77512ddcdcb49959346be37d8eb0e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack1/stack1.js @@ -12,21 +12,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "点击事件未触发", - text2: "长按事件未触发", - text3: "swipe事件未触发" + text1: '点击事件未触发', + text2: '长按事件未触发', + text3: 'swipe事件未触发' }, - ...backPage("pages/component/stack/indexEvent/index"), + ...backPage('pages/component/stack/indexEvent/index'), clickFunc: function() { - this.text1 = "点击事件已触发"; + this.text1 = '点击事件已触发'; }, longpressFunc: function() { - this.text2 = "长按事件已触发"; + this.text2 = '长按事件已触发'; }, stackswipe: function(e) { - this.text3 = "swipe方向：" + e.direction; + this.text3 = 'swipe方向：' + e.direction; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js index 8b3437bfd0b3809484a88286b6276d227509afe3..f2e3af747aa0cb847225e26a7c273a208a2c3a97 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack2/stack2.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "背景色绿色", - text2: "left设置85", - text3: "top设置170" + text1: '背景色绿色', + text2: 'left设置85', + text3: 'top设置170' }, - ...backPage("pages/component/stack/indexStyle/index") + ...backPage('pages/component/stack/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js index 5339fd055c90b325da58f87446aa4522b8b7e5a1..faaaba6c4dd47d774d8e93afb977a0464bca92ea 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack3/stack3.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "margin左边距85", - text2: "margin上边距10", - text3: "宽高已设置" + text1: 'margin左边距85', + text2: 'margin上边距10', + text3: '宽高已设置' }, - ...backPage("pages/component/stack/indexStyle/index") + ...backPage('pages/component/stack/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js index cd461cee24bed6bb73799c8d4696eed3feaa61b6..c0fc7fe4adae81a74fb83515ee75de43c9b2998b 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack4/stack4.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/stack/indexStyle/index") + ...backPage('pages/component/stack/indexStyle/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js index 8305474e89555e833fce45e5442915e6b79ebe09..9811d245f94bba3c118c004d13366cc1eea742df 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack5/stack5.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/stack/indexEvent/index") + ...backPage('pages/component/stack/indexEvent/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js index 54eff9f5a78dbdd5b5bbc9b8f94bd72738484b4a..0004cd7e61f32925c49b5828bff2729a3b5bd5ac 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack6/stack6.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; -import { changeStatus } from "../../../../common/js/stack"; +import { backPage, routePage } from '../../../../common/js/general'; +import { changeStatus } from '../../../../common/js/stack'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true, - div01: "div01" + div01: 'div01' }, - ...backPage("pages/component/stack/indexAttr/index"), + ...backPage('pages/component/stack/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js index 83a229e36995924cce9ca13fcb4ad3cae6bac473..46efe83feb962c7e1d354069a837be60b0982abf 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack7/stack7.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "点击按钮改变状态", - loopArray: ["1", "2", "3"], - display: "flex" + text1: '点击按钮改变状态', + loopArray: ['1', '2', '3'], + display: 'flex' }, - ...backPage("pages/component/stack/indexAttr/index"), + ...backPage('pages/component/stack/indexAttr/index'), changeDisplay: function() { - if (this.display === "flex") { - this.display = "none"; + if (this.display === 'flex') { + this.display = 'none'; } else { - this.display = "flex"; + this.display = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.js index b53e8929ebf0ffea26a2dfd674356eee402eac92..ed05c51c5642bf197fbf3d2dcf4554fcd5685f6e 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/stack/stack8/stack8.js @@ -12,13 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; -import { changeStatus } from "../../../../common/js/stack"; +import { backPage, routePage } from '../../../../common/js/general'; +import { changeStatus } from '../../../../common/js/stack'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, - ...backPage("pages/component/stack/indexAttr/index"), + ...backPage('pages/component/stack/indexAttr/index'), changeStatus: changeStatus }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/index/index.js index 72f25bfe8dc39e7fa4e2caafdefd2704d6e7f66c..6a83b8ab40e3a2c8808bd5bc55f775a3e2b23420 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/index/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/containerIndex/index"), - changePage1: routePage("pages/component/swiper/indexAttr/index").changePage, - changePage2: routePage("pages/component/swiper/indexStyle/index").changePage, - changePage3: routePage("pages/component/swiper/indexEvent/index").changePage, - changePage4: routePage("pages/component/swiper/indexSpecSet/index").changePage + ...backPage('pages/component/index/containerIndex/index'), + changePage1: routePage('pages/component/swiper/indexAttr/index').changePage, + changePage2: routePage('pages/component/swiper/indexStyle/index').changePage, + changePage3: routePage('pages/component/swiper/indexEvent/index').changePage, + changePage4: routePage('pages/component/swiper/indexSpecSet/index').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.js index dd070f1d805e508272dc8f5c6ac67755805efebb..ca127983fb2ec0941678b8dfde5523a21de2173b 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexAttr/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/swiper/index/index"), - changePage1: routePage("pages/component/swiper/swiper6/swiper6").changePage, - changePage2: routePage("pages/component/swiper/swiper7/swiper7").changePage, - changePage3: routePage("pages/component/swiper/swiper11/swiper11").changePage + ...backPage('pages/component/swiper/index/index'), + changePage1: routePage('pages/component/swiper/swiper6/swiper6').changePage, + changePage2: routePage('pages/component/swiper/swiper7/swiper7').changePage, + changePage3: routePage('pages/component/swiper/swiper11/swiper11').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.js index edc0c3ecb354d7945736141fee7e56c2dd8a1c06..b90d6e6ae7496e256965c559cf4b580d8acb8ed6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexEvent/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/swiper/index/index"), - changePage1: routePage("pages/component/swiper/swiper1/swiper1").changePage + ...backPage('pages/component/swiper/index/index'), + changePage1: routePage('pages/component/swiper/swiper1/swiper1').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.js index f6990d42534a152d8b7eaaf17408c251c585bf68..4be30fd4e3fd6d3e643cae9082eaaba6603753ee 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexSpecSet/index.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/swiper/index/index"), - changePage1: routePage("pages/component/swiper/swiper5/swiper5").changePage + ...backPage('pages/component/swiper/index/index'), + changePage1: routePage('pages/component/swiper/swiper5/swiper5').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.js index c8a4f02c122277e1db352cf95bdfce368ce8fa01..49f8bca78b263208339b27cf8df2041088f80773 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/indexStyle/index.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/swiper/index/index"), - changePage1: routePage("pages/component/swiper/swiper2/swiper2").changePage, - changePage2: routePage("pages/component/swiper/swiper3/swiper3").changePage, - changePage3: routePage("pages/component/swiper/swiper4/swiper4").changePage, - changePage4: routePage("pages/component/swiper/swiper8/swiper8").changePage, - changePage5: routePage("pages/component/swiper/swiper9/swiper9").changePage, - changePage6: routePage("pages/component/swiper/swiper10/swiper10").changePage + ...backPage('pages/component/swiper/index/index'), + changePage1: routePage('pages/component/swiper/swiper2/swiper2').changePage, + changePage2: routePage('pages/component/swiper/swiper3/swiper3').changePage, + changePage3: routePage('pages/component/swiper/swiper4/swiper4').changePage, + changePage4: routePage('pages/component/swiper/swiper8/swiper8').changePage, + changePage5: routePage('pages/component/swiper/swiper9/swiper9').changePage, + changePage6: routePage('pages/component/swiper/swiper10/swiper10').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.js index 5d68c2cbdb55b63560b5da7c44a3f8a521b668d5..8aa682134acc431e0f011c593eea95c3a3247d98 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper1/swiper1.js @@ -12,23 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { index: 0, - text2: "longpress未触发", - text3: "click未触发", - text4: "swipe未触发" + text2: 'longpress未触发', + text3: 'click未触发', + text4: 'swipe未触发' }, - ...backPage("pages/component/swiper/indexEvent/index"), + ...backPage('pages/component/swiper/indexEvent/index'), textChange2: function() { - this.text2 = "longpress已触发"; + this.text2 = 'longpress已触发'; }, textChange3: function() { - this.text3 = "click已触发"; + this.text3 = 'click已触发'; }, textChange4: function(e) { - this.text4 = "swipe方向：" + e.direction; + this.text4 = 'swipe方向：' + e.direction; }, showPage: function(e) { this.index = e.index + 1; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.js index 644ada24d2521ba7e2f4546d80e3e09cb4a0e925..01a178f0fe0786f0c40a1c4199cc3687d7ab7eb4 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper10/swiper10.js @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - text1: "点击改变display", - status: "flex" + text1: '点击改变display', + status: 'flex' }, - ...backPage("pages/component/swiper/indexStyle/index"), + ...backPage('pages/component/swiper/indexStyle/index'), changeStatus: function() { - if (this.status === "flex") { - this.status = "none"; + if (this.status === 'flex') { + this.status = 'none'; } else { - this.status = "flex"; + this.status = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.js index 9dcc341603de90d4ce3fbbfdb8aeffb1d73fe9cd..29e8728725dd44bf733a4a72843fbd3b413d948c 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper11/swiper11.js @@ -12,10 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - listData: ["第一个swiper", "第二个swiper"] + listData: ['第一个swiper', '第二个swiper'] }, - ...backPage("pages/component/swiper/indexAttr/index") + ...backPage('pages/component/swiper/indexAttr/index') }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.js index 9b9885c3da0f22a43b52ef8108adc48662b1f00d..322b4bafe1b30b69c4f3b54f1bdece8167079bd0 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper2/swiper2.js @@ -13,12 +13,13 @@ * limitations under the License. */ // swiper2.js -import { backPage, routePage } from "../../../../common/js/general"; -import { showPage } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { showPage } from '../../../../common/js/swiper'; export default { data: { index: 0 }, - ...backPage("pages/component/swiper/indexStyle/index"), + ...backPage('pages/component/swiper/indexStyle/index'), showPage: showPage }; + diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.js index 13572da87c34fcc432c043edbb8f3c4abdfac49b..aeccbeccf79210bf1cbc76509fbd9a796fba5611 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper3/swiper3.js @@ -13,12 +13,12 @@ * limitations under the License. */ // swiper3.js -import { backPage, routePage } from "../../../../common/js/general"; -import { showPage } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { showPage } from '../../../../common/js/swiper'; export default { data: { index: 0 }, - ...backPage("pages/component/swiper/indexStyle/index"), + ...backPage('pages/component/swiper/indexStyle/index'), showPage: showPage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.js index f292a836c4110fde35046cfa005d823d13102865..08edc2ae4602c741e9135e57999fd3c1868079e7 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper4/swiper4.js @@ -13,12 +13,12 @@ * limitations under the License. */ // swiper4.js -import { backPage, routePage } from "../../../../common/js/general"; -import { showPage } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { showPage } from '../../../../common/js/swiper'; export default { data: { index: 0 }, - ...backPage("pages/component/swiper/indexStyle/index"), + ...backPage('pages/component/swiper/indexStyle/index'), showPage: showPage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.js index 05715d9fff576b3591e175a5fa3ddbd05febe4f8..ae88c8142a639dee30f614b1c7ed1820afeab61f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper5/swiper5.js @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; -import { showPage } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { showPage } from '../../../../common/js/swiper'; export default { data: { index: 2 }, - ...backPage("pages/component/swiper/indexSpecSet/index"), + ...backPage('pages/component/swiper/indexSpecSet/index'), showPage: showPage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.js index 7285927041223b5d6e86b06eb3da3b0674093020..dee35154047c4c9d987bef34d1f74aa22f2d6143 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper6/swiper6.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; -import { changeStatus } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { changeStatus } from '../../../../common/js/swiper'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, - ...backPage("pages/component/swiper/indexAttr/index"), + ...backPage('pages/component/swiper/indexAttr/index'), changeStatus: changeStatus }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.js index 370aeb82064f066aa9163429c5c040a3fe440455..00fd1f0adf2d28c7e65e91754896158241b940b4 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper7/swiper7.js @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage } from "../../../../common/js/general"; -import { changeStatus } from "../../../../common/js/swiper"; +import { backPage } from '../../../../common/js/general'; +import { changeStatus } from '../../../../common/js/swiper'; export default { data: { - text1: "点击按钮改变状态", + text1: '点击按钮改变状态', status: true }, changeStatus: changeStatus, - ...backPage("pages/component/swiper/indexAttr/index") + ...backPage('pages/component/swiper/indexAttr/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.js index 1d26d288d46583146b4e0d54eed7c54cee91e0b0..8de323f0349598d10fa15eac78da78cb014992f6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper8/swiper8.js @@ -13,12 +13,12 @@ * limitations under the License. */ // swiper8.js -import { backPage, routePage } from "../../../../common/js/general"; -import { showPage } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { showPage } from '../../../../common/js/swiper'; export default { data: { index: 0 }, - ...backPage("pages/component/swiper/indexStyle/index"), + ...backPage('pages/component/swiper/indexStyle/index'), showPage: showPage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.js b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.js index b8054ae5563890305e606b10fa9dbac48bb21c57..1cfb279b1760424b72d1157508a7bcfe3f2b93d6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/swiper/swiper9/swiper9.js @@ -13,12 +13,12 @@ * limitations under the License. */ // swiper9.js -import { backPage, routePage } from "../../../../common/js/general"; -import { showPage } from "../../../../common/js/swiper"; +import { backPage, routePage } from '../../../../common/js/general'; +import { showPage } from '../../../../common/js/swiper'; export default { data: { index: 0 }, - ...backPage("pages/component/swiper/indexStyle/index"), + ...backPage('pages/component/swiper/indexStyle/index'), showPage: showPage -}; +}; \ No newline at end of file diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/attr/attr.js index fbf713340e07457b02c277f9c079122e5c35f964..9c9f25b4d1cafc036e3936261b8eec7dbbf14c8f 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/attr/attr.js @@ -12,23 +12,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { status: true, statusIf: true, listData: [true, false] }, - ...backPage("pages/component/switch/index/index"), + ...backPage('pages/component/switch/index/index'), changeStatus: function() { - if (this.status == true) { + if (this.status === true) { this.status = false; } else { this.status = true; } }, changeIf: function() { - if (this.statusIf == true) { + if (this.statusIf === true) { this.statusIf = false; } else { this.statusIf = true; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js index eb7e15eca69a8cb3e5630fd877a91f3e6eb62534..5d53bf818dfe902c0337400b8ea4752cefa13293 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/event/event.js @@ -12,26 +12,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - clickValue: "点击文字改变", - longpressValue: "长按文字改变", - swipeValue: "滑动文字改变", + clickValue: '点击文字改变', + longpressValue: '长按文字改变', + swipeValue: '滑动文字改变', checkedValue: false }, - ...backPage("pages/component/switch/index/index"), + ...backPage('pages/component/switch/index/index'), click: function() { - this.clickValue = "点击已经触发"; + this.clickValue = '点击已经触发'; }, longpress: function() { - this.longpressValue = "长按已经触发"; + this.longpressValue = '长按已经触发'; }, swipeEvent: function(e) { - this.swipeValue = "swipe方向：" + e.direction; + this.swipeValue = 'swipe方向：' + e.direction; }, change: function() { - if (this.checkedValue == false) { + if (this.checkedValue === false) { this.checkedValue = true; } else { this.checkedValue = false; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/index/index.js index aa3a1ec5f7a6f4c51a0ff8715a3fa5456c3d34fe..3f85b5d670356980c9d0c31296fee3f370569796 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/index/index.js @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/formIndex/index"), - changePage1: routePage("pages/component/switch/attr/attr").changePage, - changePage2: routePage("pages/component/switch/style/style").changePage, - changePage3: routePage("pages/component/switch/event/event").changePage + ...backPage('pages/component/index/formIndex/index'), + changePage1: routePage('pages/component/switch/attr/attr').changePage, + changePage2: routePage('pages/component/switch/style/style').changePage, + changePage3: routePage('pages/component/switch/event/event').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/style/style.js b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/style/style.js index 1c76f9ef4cd9cdcd624078e48edb086d7aa94d23..b013cb6fdd1c483748d3fd21e688c0aae227d1a5 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/switch/style/style.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/switch/style/style.js @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { data: { - status: "flex" + status: 'flex' }, - ...backPage("pages/component/switch/index/index"), + ...backPage('pages/component/switch/index/index'), changeStatus: function() { - if (this.status === "flex") { - this.status = "none"; + if (this.status === 'flex') { + this.status = 'none'; } else { - this.status = "flex"; + this.status = 'flex'; } } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/text/attr/attr.js b/frameworks/examples/showcase/src/main/js/default/pages/component/text/attr/attr.js index c920f11a8d76867e3155033743b73000afaf96b1..9ca66673bb9347dcd73d70558f0fa77ee7cfb61d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/text/attr/attr.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/text/attr/attr.js @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; -import { changeShow, changeStatusIf } from "../../../../common/js/text"; +import { goPage, routePage } from '../../../../common/js/general'; +import { changeShow, changeStatusIf } from '../../../../common/js/text'; export default { data: { showStatus: true, ifStatus: true, - display: "flex", - textfor: ["text测试for标签，abcdefg", "text测试for标签，abcdefg"] + display: 'flex', + textfor: ['text测试for标签，abcdefg', 'text测试for标签，abcdefg'] }, - ...goPage("pages/component/text/index/index"), + ...goPage('pages/component/text/index/index'), changeShow: changeShow, changeStatusIf: changeStatusIf }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.js b/frameworks/examples/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.js index 2999534e518720fb49d5a616d27b1d5fb3a94406..ad47b9eae283306e5e31e06a45a8b6e6c1bd8bb7 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/text/commonStyle/commonStyle.js @@ -13,7 +13,7 @@ * limitations under the License. */ // commonStyle.js -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/text/index/index") + ...goPage('pages/component/text/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/text/event/event.js b/frameworks/examples/showcase/src/main/js/default/pages/component/text/event/event.js index ba740aa27e5226ff4c7ef3bff0cf2e0ecc6e9442..01c614ee24ad1af5cc31d74d40e39b2cba0b293c 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/text/event/event.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/text/event/event.js @@ -12,19 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { data: { - text: "点击/长按/滑动" + text: '点击/长按/滑动' }, - ...goPage("pages/component/text/index/index"), + ...goPage('pages/component/text/index/index'), clickEvent(e) { - this.text = "点击已触发"; + this.text = '点击已触发'; }, longpressEvent() { - this.text = "长按已触发"; + this.text = '长按已触发'; }, swipeEvent(e) { - this.text = "swipe方向：" + e.direction; + this.text = 'swipe方向：' + e.direction; } }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/text/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/component/text/index/index.js index 3e8cde3cba36a8a7a4757b848de91f8690a4dae7..ebb768020df77148a74aea8f17f90511aa46241d 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/text/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/text/index/index.js @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../../../common/js/general"; +import { backPage, routePage } from '../../../../common/js/general'; export default { - ...backPage("pages/component/index/baseIndex/index"), - changePage1: routePage("pages/component/text/attr/attr").changePage, - changePage2: routePage("pages/component/text/commonStyle/commonStyle").changePage, - changePage3: routePage("pages/component/text/specStyle/specStyle").changePage, - changePage4: routePage("pages/component/text/event/event").changePage + ...backPage('pages/component/index/baseIndex/index'), + changePage1: routePage('pages/component/text/attr/attr').changePage, + changePage2: routePage('pages/component/text/commonStyle/commonStyle').changePage, + changePage3: routePage('pages/component/text/specStyle/specStyle').changePage, + changePage4: routePage('pages/component/text/event/event').changePage }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.js b/frameworks/examples/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.js index 7d5fca20ffaf2293fb9676fa3dbe686f5068579c..9126563a53eb448e64c04c335f6978b6bf6bc8e9 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/component/text/specStyle/specStyle.js @@ -13,7 +13,7 @@ * limitations under the License. */ // specStyle.js -import { goPage, routePage } from "../../../../common/js/general"; +import { goPage, routePage } from '../../../../common/js/general'; export default { - ...goPage("pages/component/text/index/index") + ...goPage('pages/component/text/index/index') }; diff --git a/frameworks/examples/showcase/src/main/js/default/pages/index/index.js b/frameworks/examples/showcase/src/main/js/default/pages/index/index.js index 83b3754f720fcda8d683d07975de0add7d6f3340..df81cdaee42194a768c2e362651a5d455680daf6 100644 --- a/frameworks/examples/showcase/src/main/js/default/pages/index/index.js +++ b/frameworks/examples/showcase/src/main/js/default/pages/index/index.js @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { backPage, routePage } from "../../common/js/general"; +import { backPage, routePage } from '../../common/js/general'; import app from '@system.app'; export default { - changeComponent1: routePage("pages/component/index/containerIndex/index").changePage, - changeComponent2: routePage("pages/component/index/baseIndex/index").changePage, - changeComponent3: routePage("pages/component/index/formIndex/index").changePage, - changeComponent4: routePage("pages/component/index/otherIndex/index").changePage, - exit(){ + changeComponent1: routePage('pages/component/index/containerIndex/index').changePage, + changeComponent2: routePage('pages/component/index/baseIndex/index').changePage, + changeComponent3: routePage('pages/component/index/formIndex/index').changePage, + changeComponent4: routePage('pages/component/index/otherIndex/index').changePage, + exit() { app.terminate(); } }; diff --git a/frameworks/module_manager/BUILD.gn b/frameworks/module_manager/BUILD.gn index 0489bbd3c3490df9f2d99a81af98089dc5ffe94f..1b61d3b2bb264e3f556d1f224f49a7f143c26d24 100644 --- a/frameworks/module_manager/BUILD.gn +++ b/frameworks/module_manager/BUILD.gn @@ -12,6 +12,7 @@ #limitations under the License. import("//build/lite/config/component/lite_component.gni") +import("//foundation/arkui/ace_engine_lite/ace_lite.gni") ace_frameworks_root = "//foundation/arkui/ace_engine_lite/frameworks" ace_interface_root = @@ -52,6 +53,8 @@ lite_library("ace_module_manager") { "//commonlibrary/utils_lite/js/builtin:ace_utils_kits", ] + defines = ace_lite_common_defines + if (ohos_kernel_type == "liteos_m") { public_deps += [ "//foundation/arkui/ui_lite:ui", @@ -67,19 +70,26 @@ lite_library("ace_module_manager") { cflags_cc = cflags } if (defined(global_parts_info.security_huks)) { - defines = [ "ENABLE_HUKS_ACE_LITE_FEATURE" ] + defines += [ "ENABLE_HUKS_ACE_LITE_FEATURE" ] } } else { public_deps += [ "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/js/builtin:capability_api", "//base/hiviewdfx/hilog_lite/frameworks/js/builtin:ace_kit_hilog", - "//base/powermgr/battery_lite/frameworks/js:ace_battery_kits", "//base/security/huks/frameworks/crypto_lite/js/builtin:ace_kit_cipher", "//foundation/communication/netstack/frameworks/js/builtin:http_lite_shared", - "//foundation/multimedia/media_lite/interfaces/kits/player_lite/js/builtin:audio_lite_api", "//test/xts/device_attest_lite/interfaces/kit/js:kit_device_attest", "//third_party/bounds_checking_function:libsec_shared", "//third_party/jerryscript/jerry-core:jerry-core_shared", ] + + if (ace_engine_lite_battery_lite_enable) { + public_deps += + [ "//base/powermgr/battery_lite/frameworks/js:ace_battery_kits" ] + } + + if (ace_engine_lite_media_lite_enable) { + public_deps += [ "//foundation/multimedia/media_lite/interfaces/kits/player_lite/js/builtin:audio_lite_api" ] + } } } diff --git a/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h b/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h index b0655bf8b5806415cd60d70bf9ad659bebedc186..3d67dd2f38e5ce766c4c46027dfdafb53cce8757 100644 --- a/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h +++ b/frameworks/module_manager/test/unittest/common/require_module_tdd_test.h @@ -36,7 +36,7 @@ class RequireModuleTddTest { #endif public: RequireModuleTddTest(); - ~RequireModuleTddTest(){} + ~RequireModuleTddTest() {} void SetUp(); void TearDown(); void RequireModuleTest001(); diff --git a/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h b/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h index 39dbc82c1ebffc67be65f86c71714866ef006fd0..5fb9ea03773b9fc1289a384170cff2de1975cb2e 100644 --- a/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h +++ b/frameworks/native_engine/async/test/unittest/common/js_async_work_tdd_test.h @@ -34,10 +34,10 @@ class JsAsyncWorkTddTest : public testing::Test { class JsAsyncWorkTddTest { #endif public: - JsAsyncWorkTddTest(){} - ~JsAsyncWorkTddTest(){} + JsAsyncWorkTddTest() {} + ~JsAsyncWorkTddTest() {} void SetUp(); - void TearDown(){} + void TearDown() {} void JsAsyncWorkTest001(); void JsAsyncWorkTest002(); void JsAsyncWorkTest003(); diff --git a/frameworks/native_engine/jsi/internal/jsi_internal.h b/frameworks/native_engine/jsi/internal/jsi_internal.h index fcdc8bdf7df396bbaf700ce42377de4c20d5cffa..e67c9adff604e4225f47dc4df60f5c14ad3f1538 100644 --- a/frameworks/native_engine/jsi/internal/jsi_internal.h +++ b/frameworks/native_engine/jsi/internal/jsi_internal.h @@ -30,13 +30,6 @@ #define AS_JSI_VALUE(jValue) (JSIValue)(uintptr_t) jValue #endif -/** - * A convenience macro to create jerry-values. - */ -#if (ENABLE_JERRY == 1) -#define JERRY_CREATE(var, create) jerry_value_t var = (create); -#endif - /** * Key words for native module callbacks. */ diff --git a/frameworks/native_engine/jsi/jsi.cpp b/frameworks/native_engine/jsi/jsi.cpp index 50e8018441a5b7d89d74402bf5b6056cc9b75d68..dd0bdc0341c72888bc13a4f86ba9748986f6e0b8 100644 --- a/frameworks/native_engine/jsi/jsi.cpp +++ b/frameworks/native_engine/jsi/jsi.cpp @@ -717,12 +717,12 @@ double JSI::ValueToNumber(JSIValue value) #if (ENABLE_JERRY == 1) jerry_value_t jVal = AS_JERRY_VALUE(value); if (!jerry_value_is_number(jVal)) { - HILOG_ERROR(HILOG_MODULE_ACE, "JSI:ValueToNumber params invalid!"); + HILOG_INFO(HILOG_MODULE_ACE, "JSI:ValueToNumber params invalid!"); return 0.0; } return jerry_get_number_value(jVal); #else - HILOG_ERROR(HILOG_MODULE_ACE, "JSI:ValueToNumber has not been implemented in this js engine!"); + HILOG_INFO(HILOG_MODULE_ACE, "JSI:ValueToNumber has not been implemented in this js engine!"); return 0.0; #endif } diff --git a/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h b/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h index ffbd21940ba9252b47b9de2b405263caf5075f22..d46eb9035b74bc1a91310735255761fa6d6526c4 100644 --- a/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h +++ b/frameworks/native_engine/jsi/test/unittest/common/jsi_interface_tdd_test.h @@ -38,7 +38,7 @@ class JsiInterfaceTddTest { #endif public: JsiInterfaceTddTest(); - ~JsiInterfaceTddTest(){} + ~JsiInterfaceTddTest() {} void SetUp(); void TearDown(); static void OnDestroy(int8_t statusCode); diff --git a/frameworks/packages/runtime-core/.eslintrc.js b/frameworks/packages/runtime-core/.eslintrc.js index 92a09df3715326fbedb40b7ef5aefe55d1c16368..0af592b9e81ecb7e0f749e3b882e84a89a45cb19 100644 --- a/frameworks/packages/runtime-core/.eslintrc.js +++ b/frameworks/packages/runtime-core/.eslintrc.js @@ -4,7 +4,7 @@ module.exports = { es6: true, node: true }, - extends: ['google'], + extends: [], globals: { profiler: 'readonly', initStyleSheet: 'readonly' diff --git a/frameworks/packages/runtime-core/package-lock.json b/frameworks/packages/runtime-core/package-lock.json index 641af2a54fec982a706ea3038c3984a6c5cdcaff..38c99bed0d842694c43add9ccced6d76b006e694 100755 --- a/frameworks/packages/runtime-core/package-lock.json +++ b/frameworks/packages/runtime-core/package-lock.json @@ -2999,15 +2999,6 @@ "integrity": "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs=", "dev": true }, - "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.2.tgz", - "integrity": "sha1-I0CQ7pfH1K0aLEvq4nUF3v/GCKQ=", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/ci-info/download/ci-info-2.0.0.tgz", @@ -3878,12 +3869,6 @@ } } }, - "eslint-config-google": { - "version": "0.14.0", - "resolved": "https://registry.npm.taobao.org/eslint-config-google/download/eslint-config-google-0.14.0.tgz", - "integrity": "sha1-T1+HWbpuEbQkKUohnb+hjFCLzBo=", - "dev": true - }, "eslint-plugin-jest": { "version": "23.13.2", "resolved": "https://registry.npm.taobao.org/eslint-plugin-jest/download/eslint-plugin-jest-23.13.2.tgz", @@ -6870,8 +6855,8 @@ "dev": true }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz", + "version": "1.4.1", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.1.tgz?cache=0&sync_timestamp=1584445207623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-1.4.1.tgz", "integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=", "dev": true, "requires": { diff --git a/frameworks/packages/runtime-core/package.json b/frameworks/packages/runtime-core/package.json index b9d2f6b41a6cc2315950730a57ce36840fa0fd25..6fc7e375792794b3b2b47a5a373977859b4f8c4a 100755 --- a/frameworks/packages/runtime-core/package.json +++ b/frameworks/packages/runtime-core/package.json @@ -19,7 +19,6 @@ "@rollup/plugin-strip": "^1.3.3", "babel-jest": "^26.0.1", "eslint": "^7.2.0", - "eslint-config-google": "^0.14.0", "eslint-plugin-jest": "^23.13.2", "jest": "^26.0.1", "prettier": "^2.0.5", diff --git a/frameworks/packages/runtime-core/src/__test__/index.test.js b/frameworks/packages/runtime-core/src/__test__/index.test.js index 117112cb153d5d59f39602c64ee4f235b9aa60bd..802b065558bd914b20616aeae36f941d845ba712 100644 --- a/frameworks/packages/runtime-core/src/__test__/index.test.js +++ b/frameworks/packages/runtime-core/src/__test__/index.test.js @@ -66,7 +66,7 @@ describe('ViewModel', () => { expect(vm.count).toBe(1); const watcher = vm.$watch( () => vm.count, - (newValue,oldValue) => { + (newValue, oldValue) => { expect(oldValue).toBe(1); expect(newValue).toBe(2); watcher.unsubscribe(); @@ -88,7 +88,7 @@ describe('ViewModel', () => { const watcher = vm.$watch( () => vm.user.name, - (newName,oldName) => { + (newName, oldName) => { expect(oldName).toBe('Chen'); expect(newName).toBe('Chen2'); watcher.unsubscribe(); @@ -355,7 +355,7 @@ describe('ViewModel', () => { () => vm.a + vm.b, number => { expect(number).toEqual(4); - watcher.unsubscribe() + watcher.unsubscribe(); done(); } ); @@ -364,7 +364,7 @@ describe('ViewModel', () => { () => vm.a + vm.b, number => { expect(number).toEqual(5); - watcher2.unsubscribe() + watcher2.unsubscribe(); done(); } ); diff --git a/frameworks/packages/runtime-core/src/core/index.js b/frameworks/packages/runtime-core/src/core/index.js index e54def14ce828e52174eb2aeb44e7014383528cf..ee408ea413b520eba9eb61bfc96aee76554b58c2 100644 --- a/frameworks/packages/runtime-core/src/core/index.js +++ b/frameworks/packages/runtime-core/src/core/index.js @@ -78,7 +78,7 @@ function initState(vm, data) { stopTracing(); // PHASE_INIT_DATA_GET_DATA if ((typeof __appVing__ !== 'undefined') && __appVing__) { - vm['data'] = data; + vm.data = data; stopTracing(); // PHASE_INIT_STATE return; // is evaling app.js, mount to this and skip state initialization } diff --git a/frameworks/packages/runtime-core/src/observer/observer.js b/frameworks/packages/runtime-core/src/observer/observer.js index 7e9e0b60d2957cc21ad81315e63bce12be4c7b87..62cdb29420cc0c68ce02e7813ad81b3bc64f7d0a 100644 --- a/frameworks/packages/runtime-core/src/observer/observer.js +++ b/frameworks/packages/runtime-core/src/observer/observer.js @@ -59,6 +59,7 @@ Observer.prototype.subscribe = function(subject, key) { this._detaches = new Set(); } this._detaches.add(detach); + return void 1; }; Observer.prototype.unsubscribe = function() { @@ -70,4 +71,5 @@ Observer.prototype.unsubscribe = function() { detach(); }); this._detaches.clear(); + return void 1; }; diff --git a/frameworks/packages/runtime-core/src/observer/subject.js b/frameworks/packages/runtime-core/src/observer/subject.js index 28ca09046ab2fe53a21b9c4fa3dfb06691abda62..118983243515862b8a2e31a06ec5e888059afb09 100644 --- a/frameworks/packages/runtime-core/src/observer/subject.js +++ b/frameworks/packages/runtime-core/src/observer/subject.js @@ -78,6 +78,7 @@ Subject.prototype.notify = function(key) { return void 0; } this._obsMap[key].forEach(observer => observer.update()); + return void 1; }; Subject.prototype.setParent = function(parent, key) { diff --git a/frameworks/src/core/animation/transition_impl.cpp b/frameworks/src/core/animation/transition_impl.cpp index 349eb6f91675e0a1a5e6b56e5defcb134fc9b079..a0e422c31276f77d7797596fe244a6770120a6af 100644 --- a/frameworks/src/core/animation/transition_impl.cpp +++ b/frameworks/src/core/animation/transition_impl.cpp @@ -39,6 +39,7 @@ void TransitionImpl::Callback(UIView *view) { (void)(view); if (animator_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "animator is nullptr"); return; } int32_t elapsedTime = animator_->GetRunTime() - params_.delay; // animation execution time diff --git a/frameworks/src/core/animation/transition_impl.h b/frameworks/src/core/animation/transition_impl.h index 4e259e7847f24112f1c552b0b9fd93ef805b4d0d..ff344fcd5717a1a49a742cb8fd41396854502007 100644 --- a/frameworks/src/core/animation/transition_impl.h +++ b/frameworks/src/core/animation/transition_impl.h @@ -71,7 +71,7 @@ struct TransitionParams { opacity_from(-1), opacity_to(-1), background_color_from(RGB_COLOR_VALUE_MAX), - background_color_to(RGB_COLOR_VALUE_MAX){} + background_color_to(RGB_COLOR_VALUE_MAX) {} }; struct ViewStatus { diff --git a/frameworks/src/core/base/dfx_assist.cpp b/frameworks/src/core/base/dfx_assist.cpp index 940df71d903abd7553d8326f4c411bd52430687e..fdd67d0d3cd15e8a096c2a23007f2f377853c0e4 100644 --- a/frameworks/src/core/base/dfx_assist.cpp +++ b/frameworks/src/core/base/dfx_assist.cpp @@ -55,6 +55,7 @@ void DfxAssist::DumpErrorCode(const jerry_value_t errorValue) errStrBuffer[stringEnd] = '\0'; // output to platform trace HILOG_ERROR(HILOG_MODULE_ACE, " [JS Error]: %{public}s", reinterpret_cast(errStrBuffer)); + PrintErrorInfo(errStrSize, errStrBuffer); // output to user console LogString(LogLevel::LOG_LEVEL_ERR, "[JS Exception]: "); LogString(LogLevel::LOG_LEVEL_ERR, reinterpret_cast(errStrBuffer)); @@ -110,6 +111,7 @@ void DfxAssist::DumpErrorMessage(const jerry_value_t errorValue) jerry_size_t stringEnd = jerry_string_to_utf8_char_buffer(itemVal, errStrBuffer, strSize); errStrBuffer[stringEnd] = '\0'; HILOG_ERROR(HILOG_MODULE_ACE, "%{public}u: %{public}s", i, reinterpret_cast(errStrBuffer)); + PrintErrorInfo(strSize, errStrBuffer); } jerry_release_value(itemVal); } @@ -117,5 +119,15 @@ void DfxAssist::DumpErrorMessage(const jerry_value_t errorValue) errStrBuffer = nullptr; jerry_release_value(backtraceVal); } + +void DfxAssist::PrintErrorInfo(jerry_size_t size, jerry_char_t* errorValue) +{ +#if defined(FEATURE_ACELITE_MC_LOG_PRINTF) && (FEATURE_ACELITE_MC_LOG_PRINTF == 1) + size_t length = reinterpret_cast(size); + char* buffer = reinterpret_cast(errorValue); + + HILOG_CHARACTERS(length, buffer); +#endif +} } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/base/dfx_assist.h b/frameworks/src/core/base/dfx_assist.h index e960ad8b716ab50a5a856ac290ddeb7651ae4364..8661d90d6905c11ebebf948ce7a9863cb8390d82 100644 --- a/frameworks/src/core/base/dfx_assist.h +++ b/frameworks/src/core/base/dfx_assist.h @@ -42,6 +42,9 @@ public: * @brief dump js stack error message */ void DumpErrorMessage(const jerry_value_t errorValue); + +private: + void PrintErrorInfo(jerry_size_t size, jerry_char_t* errorValue); }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/base/framework_min_bc.h b/frameworks/src/core/base/framework_min_bc.h index c730249c1b446feb5753fc12b54aa4d4a2040ed7..80a28badbb64b31b632dde2a1369c4c0dc1c0bf2 100644 --- a/frameworks/src/core/base/framework_min_bc.h +++ b/frameworks/src/core/base/framework_min_bc.h @@ -25,8 +25,7 @@ #ifndef OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER #define OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER -const uint8_t g_frameworkBCBuffer[] = -{ +const uint8_t FRAMEWORK_BC_BUFFER[] = { 0x4a, 0x52, 0x52, 0x59, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x41, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x33, 0x2c, diff --git a/frameworks/src/core/base/js_fwk_common.cpp b/frameworks/src/core/base/js_fwk_common.cpp index 464ff50405c6508dfa09f8e1c4bbc3bf0c58f36f..90a082182fb212836958cf14c935908bbd9f6a2e 100644 --- a/frameworks/src/core/base/js_fwk_common.cpp +++ b/frameworks/src/core/base/js_fwk_common.cpp @@ -14,6 +14,7 @@ */ #include "js_fwk_common.h" #include +#include #include #include #include @@ -131,6 +132,7 @@ char *MallocStringOf(jerry_value_t source) char *MallocStringOf(jerry_value_t source, uint16_t *strLength) { if ((IS_UNDEFINED(source)) || (strLength == nullptr)) { + HILOG_ERROR(HILOG_MODULE_ACE, "Invalid input: source is undefined or strLength is nullptr"); return nullptr; } @@ -152,6 +154,7 @@ char *MallocStringOf(jerry_value_t source, uint16_t *strLength) jerry_size_t size = jerry_get_string_size(target); if (size >= UINT16_MAX) { + HILOG_ERROR(HILOG_MODULE_ACE, "String size exceeds UINT16_MAX, cannot process"); break; } buffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (size + 1))); @@ -578,10 +581,17 @@ int32_t GetFileSize(const char * const filePath) return 0; } struct stat info = {0}; - int32_t ret = stat(filePath, &info); - if (ret < 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "file doesn't exit or it's empty, [%{public}s]", filePath); + const int retryCount = 5; + for (int i = 0; i < retryCount; i++) { + int32_t ret = stat(filePath, &info); + if (ret < 0) { + HILOG_ERROR(HILOG_MODULE_ACE, "file doesn't exit or it's empty, [%{public}s],\ + errno: %{public}d, desc = %{public}s", filePath, errno, strerror(errno) ); + } else { + break; + } } + return info.st_size; } @@ -622,7 +632,7 @@ static void OutputFileMaxLimitationTrace(const char * const fullPath, size_t lim char traceData[traceDataLen] = {0}; const size_t oneKB = 1024; size_t currentLimitation = limitation / oneKB; - if (sprintf_s(traceData, traceDataLen, "%s is bigger than %d KB.\n", (ptr + 1), currentLimitation) < 0) { + if (sprintf_s(traceData, traceDataLen, "%s is bigger than %zu KB.\n", (ptr + 1), currentLimitation) < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "splice trace data failed."); return; } @@ -728,6 +738,9 @@ char *ReadJSFile(const char * const appPath, const char * const jsFileName, uint } char *fileBuffer = ReadFile(fullPath, fileSize, JsAppEnvironment::GetInstance()->IsSnapshotMode()); + if (fileBuffer == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "Failed to read JS file from path: %{public}s", fullPath); + } ace_free(fullPath); fullPath = nullptr; return fileBuffer; diff --git a/frameworks/src/core/base/js_fwk_common.h b/frameworks/src/core/base/js_fwk_common.h index 84b370086840a27d62f53239b37c770dd30cf307..64379669bd4d32c4828a8ddf7c478e3ff2bc99fa 100644 --- a/frameworks/src/core/base/js_fwk_common.h +++ b/frameworks/src/core/base/js_fwk_common.h @@ -52,19 +52,23 @@ struct Watcher : public MemoryHeap { #endif #ifndef ACE_FREE -#define ACE_FREE(pointer) \ - if (pointer != nullptr) { \ - ace_free(pointer); \ - pointer = nullptr; \ - } +#define ACE_FREE(pointer) \ + do { \ + if (pointer != nullptr) { \ + ace_free(pointer); \ + pointer = nullptr; \ + } \ + } while (false) #endif // ACE_FREE #ifndef ACE_DELETE -#define ACE_DELETE(pointer) \ - if (pointer != nullptr) { \ - delete pointer; \ - pointer = nullptr; \ - } +#define ACE_DELETE(pointer) \ + do { \ + if (pointer != nullptr) { \ + delete pointer; \ + pointer = nullptr; \ + } \ + } while (false) #endif // ACE_DELETE #if IS_ENABLED(JS_PROFILER) diff --git a/frameworks/src/core/base/keys.h b/frameworks/src/core/base/keys.h index 7bc649b30d90ff9e66f8f07654e0abd6f46c28f9..64de90edb7774c6b72c8f4501be7fc10f5a2b7f0 100644 --- a/frameworks/src/core/base/keys.h +++ b/frameworks/src/core/base/keys.h @@ -276,7 +276,7 @@ enum { KEYWORD(START_ANGLE, startAngle) // circle progress start angle KEYWORD(STEP, step) KEYWORD(STROKE_WIDTH, strokeWidth) // horizon/arc progress style - KEYWORD(SWIPE, swipe) // swipe event listener + KEYWORD(SWIPE, swipe) // swipe event listener KEYWORD(SWIPER, swiper) // tag name KEYWORD(SWITCH, switch) // tag name #if (FEATURE_COMPONENT_TABS == 1) diff --git a/frameworks/src/core/base/product_adapter.cpp b/frameworks/src/core/base/product_adapter.cpp index 1ca6f5755a5d01a312d58766bb5071991e95f4f5..c8213ef1603fb621baa08bc54b3d3779e0e15461 100644 --- a/frameworks/src/core/base/product_adapter.cpp +++ b/frameworks/src/core/base/product_adapter.cpp @@ -32,24 +32,24 @@ namespace ACELite { */ struct DFXWrapper { DFXWrapper() - : eventTag_(0), - eventSubTag_(0), - errCodeTag_(0), - errCodeSubTag_(0), - eventPrintHandler_(nullptr), - errCodePrintHandler_(nullptr), - jsLogOutputHandler_(nullptr), - nativeMemInfoGetter_(nullptr) + : eventTag(0), + eventSubTag(0), + errCodeTag(0), + errCodeSubTag(0), + eventPrintHandler(nullptr), + errCodePrintHandler(nullptr), + jsLogOutputHandler(nullptr), + nativeMemInfoGetter(nullptr) { } - uint8_t eventTag_; - uint8_t eventSubTag_; - uint8_t errCodeTag_; - uint8_t errCodeSubTag_; - EventPrintHandler eventPrintHandler_; - ErrCodePrintHandler errCodePrintHandler_; - JSLogOutputHandler jsLogOutputHandler_; - NativeMemInfoGetter nativeMemInfoGetter_; + uint8_t eventTag; + uint8_t eventSubTag; + uint8_t errCodeTag; + uint8_t errCodeSubTag; + EventPrintHandler eventPrintHandler; + ErrCodePrintHandler errCodePrintHandler; + JSLogOutputHandler jsLogOutputHandler; + NativeMemInfoGetter nativeMemInfoGetter; }; static DFXWrapper g_dfxWrapper; @@ -69,13 +69,13 @@ static uint16_t g_screenHeight = 454; // default app private data root path const static char *DEFAULT_APP_DATA_PATH = "user/ace/data/"; -static const char *g_defaultDataRootPath = DEFAULT_APP_DATA_PATH; +static const char *DEFAULT_DATA_ROOT_PATH = DEFAULT_APP_DATA_PATH; // default device info const static uint8_t DEVICE_TYPE_STR_LEN = 24; const static char *DEFAULT_DEVICE_TYPE_NAME = "smartVision"; // smartVision as default -static const char *g_deviceType = DEFAULT_DEVICE_TYPE_NAME; +static const char *DEVICE_TYPE = DEFAULT_DEVICE_TYPE_NAME; // indicating if the ace application is on foreground static bool g_isRenderTickAcceptable = false; @@ -87,26 +87,26 @@ void ProductAdapter::InitAceTags(uint8_t *aceTags, uint8_t tagCount) return; } uint8_t index = 0; - g_dfxWrapper.eventTag_ = aceTags[index++]; - g_dfxWrapper.eventSubTag_ = aceTags[index++]; - g_dfxWrapper.errCodeTag_ = aceTags[index++]; - g_dfxWrapper.errCodeSubTag_ = aceTags[index++]; + g_dfxWrapper.eventTag = aceTags[index++]; + g_dfxWrapper.eventSubTag = aceTags[index++]; + g_dfxWrapper.errCodeTag = aceTags[index++]; + g_dfxWrapper.errCodeSubTag = aceTags[index++]; } void ProductAdapter::InitTraceHandlers(EventPrintHandler eventHandler, ErrCodePrintHandler errCodeHandler) { - g_dfxWrapper.eventPrintHandler_ = eventHandler; - g_dfxWrapper.errCodePrintHandler_ = errCodeHandler; + g_dfxWrapper.eventPrintHandler = eventHandler; + g_dfxWrapper.errCodePrintHandler = errCodeHandler; } void ProductAdapter::InitConsoleNativeHandler(JSLogOutputHandler handler) { - g_dfxWrapper.jsLogOutputHandler_ = handler; + g_dfxWrapper.jsLogOutputHandler = handler; } void ProductAdapter::InitNativeMemPoolHook(NativeMemInfoGetter getter) { - g_dfxWrapper.nativeMemInfoGetter_ = getter; + g_dfxWrapper.nativeMemInfoGetter = getter; } void ProductAdapter::InitExtraModulesGetter(ProductModulesGetter productModuleGetter, @@ -122,38 +122,38 @@ void ProductAdapter::InitExtraModulesGetter(ProductModulesGetter productModuleGe void ProductAdapter::PrintEventTrace(uint8_t info2, uint8_t info3, uint8_t info4) { - if (g_dfxWrapper.eventPrintHandler_ == nullptr || g_dfxWrapper.eventTag_ == 0 || g_dfxWrapper.eventSubTag_ == 0) { + if (g_dfxWrapper.eventPrintHandler == nullptr || g_dfxWrapper.eventTag == 0 || g_dfxWrapper.eventSubTag == 0) { return; } - uint8_t subTag = (info2 == 0) ? g_dfxWrapper.eventSubTag_ : info2; - g_dfxWrapper.eventPrintHandler_(g_dfxWrapper.eventTag_, subTag, info3, info4); + uint8_t subTag = (info2 == 0) ? g_dfxWrapper.eventSubTag : info2; + g_dfxWrapper.eventPrintHandler(g_dfxWrapper.eventTag, subTag, info3, info4); } void ProductAdapter::PrintErrCode(uint8_t info2, uint16_t rfu) { - if (g_dfxWrapper.errCodePrintHandler_ == nullptr || g_dfxWrapper.errCodeTag_ == 0 || - g_dfxWrapper.errCodeSubTag_ == 0) { + if (g_dfxWrapper.errCodePrintHandler == nullptr || g_dfxWrapper.errCodeTag == 0 || + g_dfxWrapper.errCodeSubTag == 0) { return; } - g_dfxWrapper.errCodePrintHandler_(g_dfxWrapper.errCodeTag_, g_dfxWrapper.errCodeSubTag_, info2, rfu); + g_dfxWrapper.errCodePrintHandler(g_dfxWrapper.errCodeTag, g_dfxWrapper.errCodeSubTag, info2, rfu); } void ProductAdapter::OutputJSConsoleLog(uint8_t level, const char *content) { - if (g_dfxWrapper.jsLogOutputHandler_ == nullptr) { + if (g_dfxWrapper.jsLogOutputHandler == nullptr) { return; } - g_dfxWrapper.jsLogOutputHandler_(level, content); + g_dfxWrapper.jsLogOutputHandler(level, content); } void ProductAdapter::GetNativeMemInfo(NativeMemInfo *memInfo) { - if (g_dfxWrapper.nativeMemInfoGetter_ == nullptr) { + if (g_dfxWrapper.nativeMemInfoGetter == nullptr) { return; } - g_dfxWrapper.nativeMemInfoGetter_(memInfo); + g_dfxWrapper.nativeMemInfoGetter(memInfo); } void ProductAdapter::RegTerminatingHandler(TerminateAbilityHandler handler) @@ -355,12 +355,12 @@ void ProductAdapter::ConfigPrivateDataRootPath(const char *appDataRoot) if (pathLen == 0 || pathLen >= UINT8_MAX) { return; } - g_defaultDataRootPath = appDataRoot; + DEFAULT_DATA_ROOT_PATH = appDataRoot; } const char *ProductAdapter::GetPrivateDataRootPath() { - return g_defaultDataRootPath; + return DEFAULT_DATA_ROOT_PATH; } void ProductAdapter::InitDeviceInfo(const char *deviceType) @@ -368,12 +368,12 @@ void ProductAdapter::InitDeviceInfo(const char *deviceType) if (deviceType == nullptr || (strlen(deviceType) == 0) || strlen(deviceType) >= DEVICE_TYPE_STR_LEN) { return; } - g_deviceType = deviceType; + DEVICE_TYPE = deviceType; } const char *ProductAdapter::GetDeviceType() { - return g_deviceType; + return DEVICE_TYPE; } void ProductAdapter::RestoreSystemWrapper(const char *crashMessage) diff --git a/frameworks/src/core/base/string_util.cpp b/frameworks/src/core/base/string_util.cpp index 760b5bbd8f77851bc4ca12d541dd8dff1d915bc3..f83362b1110e3b0067e1de0464e35fbfba1c1658 100644 --- a/frameworks/src/core/base/string_util.cpp +++ b/frameworks/src/core/base/string_util.cpp @@ -40,6 +40,7 @@ char *StringUtil::Copy(const char *sequence) ace_free(buffer); return nullptr; } + char *StringUtil::Malloc(const uint32_t size) { char *buffer = static_cast(ace_malloc(size + 1)); @@ -49,6 +50,7 @@ char *StringUtil::Malloc(const uint32_t size) buffer[size] = '\0'; return buffer; } + char *StringUtil::Slice(const char *sequence, const int32_t start) { return StringUtil::Slice(sequence, start, strlen(sequence)); diff --git a/frameworks/src/core/components/canvas_component.cpp b/frameworks/src/core/components/canvas_component.cpp index 73bf27c42feac498d6068b3fb0e66ad90be200e1..c415aa9e5d4aca3fc627b942ab322ee01d8514d0 100644 --- a/frameworks/src/core/components/canvas_component.cpp +++ b/frameworks/src/core/components/canvas_component.cpp @@ -2136,8 +2136,7 @@ jerry_value_t CanvasComponent::SetLineDash(const jerry_value_t func, delete[] buff; HILOG_ERROR(HILOG_MODULE_ACE, "canvas_component: value is nullptr error!"); return jerry_create_error(JERRY_ERROR_TYPE, - reinterpret_cast - ("canvas_component: value is nullptr error!")); + reinterpret_cast("canvas_component:value is nullptr error!")); } num = atof(value); ACE_FREE(value); diff --git a/frameworks/src/core/components/chart_component.h b/frameworks/src/core/components/chart_component.h index 2e515fdff9d1f258bbc04d06e8490f4a3186ef60..aabc5f6e4fb10099912c0a1f4aa1c67c444c233d 100644 --- a/frameworks/src/core/components/chart_component.h +++ b/frameworks/src/core/components/chart_component.h @@ -54,7 +54,7 @@ struct SeriesOptions : public MemoryHeap { bool isLoopSet; ACE_DISALLOW_COPY_AND_MOVE(SeriesOptions); SeriesOptions() : width(1), margin(1), head(nullptr), top(nullptr), bottom(nullptr), smooth(false), - isHeadSet(false), isTopSet(false), isBottomSet(false), isLoopSet(false){} + isHeadSet(false), isTopSet(false), isBottomSet(false), isLoopSet(false) {} }; class ChartComponent final : public Component { diff --git a/frameworks/src/core/components/component.cpp b/frameworks/src/core/components/component.cpp index 7962a0ef56bd72ed8aa3ac58690cbcc52cd726fa..99ed461d4d27d12f1626a2135256a07f1454f4e5 100644 --- a/frameworks/src/core/components/component.cpp +++ b/frameworks/src/core/components/component.cpp @@ -862,6 +862,93 @@ void Component::SetAnimationKeyFrames(int16_t keyId, int32_t valueFrom, int32_t } } +void Component::SetAnimationDuration(const AppStyleItem *styleItem, const char *strValue) +{ + if ((styleItem == nullptr) || (!const_cast(styleItem)->UpdateNumValToStr()) + || strValue == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "SetAnimationDuration fail"); + return; + } + + if (!IsStyleValueTypeString(styleItem)) { + HILOG_ERROR(HILOG_MODULE_ACE, "style animation during value is invalid!"); + return; + } + trans_->during = ParseToMilliseconds(strValue); +} + +void Component::SetAnimationTimingFunction(const char *strValue, size_t strLen) +{ + if (strValue == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "SetAnimationTimingFunction fail"); + return; + } + + uint16_t animationTimingKeyId = KeyParser::ParseKeyId(strValue, strLen); + switch (animationTimingKeyId) { + case K_EASE_IN: + trans_->easing = EasingType::EASE_IN; + break; + case K_EASE_OUT: + trans_->easing = EasingType::EASE_OUT; + break; + case K_EASE_IN_OUT: + trans_->easing = EasingType::EASE_IN_OUT; + break; + default: + trans_->easing = EasingType::LINEAR; + break; + } +} + +void Component::SetAnimationFillMode(const char *strValue, size_t strLen) +{ + if (strValue == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "SetAnimationFillMode fail"); + return; + } + + uint16_t animationFillKeyId = KeyParser::ParseKeyId(strValue, strLen); + switch (animationFillKeyId) { + case K_FORWARDS: + trans_->fill = OptionsFill::FORWARDS; + break; + default: + trans_->fill = OptionsFill::FNONE; + break; + } +} + +void Component::SetAnimationDelay(const AppStyleItem *styleItem, const char *strValue) +{ + if ((styleItem == nullptr) || (!const_cast(styleItem)->UpdateNumValToStr()) + || strValue == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "SetAnimationDelay fail"); + return; + } + + if (!IsStyleValueTypeString(styleItem)) { + HILOG_ERROR(HILOG_MODULE_ACE, "style animation delay value is invalid!"); + return; + } + trans_->delay = ParseToMilliseconds(strValue); +} + +void Component::SetAnimationIterationCount(const AppStyleItem *styleItem, const char *strValue) +{ + if ((styleItem == nullptr) || (!const_cast(styleItem)->UpdateNumValToStr()) + || strValue == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "SetAnimationIterationCount fail"); + return; + } + + if (!IsStyleValueTypeString(styleItem)) { + HILOG_ERROR(HILOG_MODULE_ACE, "style iteration count value is invalid!"); + return; + } + trans_->iterations = TransitionImpl::GetNumIterations(strValue); +} + void Component::SetAnimationStyle(const UIView &view, const AppStyleItem *styleItem, const int16_t keyId) { // special for "animation-iteration-count" which value could be a number or string "infinite" @@ -885,57 +972,23 @@ void Component::SetAnimationStyle(const UIView &view, const AppStyleItem *styleI } switch (keyId) { case K_ANIMATION_DURATION: { - if (!IsStyleValueTypeString(styleItem)) { - HILOG_ERROR(HILOG_MODULE_ACE, "style animation during value is invalid!"); - return; - } - trans_->during = ParseToMilliseconds(strValue); + SetAnimationDuration(styleItem, strValue); break; } case K_ANIMATION_TIMING_FUNCTION: { - uint16_t animationTimingKeyId = KeyParser::ParseKeyId(strValue, strLen); - switch (animationTimingKeyId) { - case K_EASE_IN: - trans_->easing = EasingType::EASE_IN; - break; - case K_EASE_OUT: - trans_->easing = EasingType::EASE_OUT; - break; - case K_EASE_IN_OUT: - trans_->easing = EasingType::EASE_IN_OUT; - break; - default: - trans_->easing = EasingType::LINEAR; - break; - } + SetAnimationTimingFunction(strValue, strLen); break; } case K_ANIMATION_FILL_MODE: { - uint16_t animationFillKeyId = KeyParser::ParseKeyId(strValue, strLen); - switch (animationFillKeyId) { - case K_FORWARDS: - trans_->fill = OptionsFill::FORWARDS; - break; - default: - trans_->fill = OptionsFill::FNONE; - break; - } + SetAnimationFillMode(strValue, strLen); break; } case K_ANIMATION_DELAY: { - if (!IsStyleValueTypeString(styleItem)) { - HILOG_ERROR(HILOG_MODULE_ACE, "style animation delay value is invalid!"); - return; - } - trans_->delay = ParseToMilliseconds(strValue); + SetAnimationDelay(styleItem, strValue); break; } case K_ANIMATION_ITERATION_COUNT: { - if (!IsStyleValueTypeString(styleItem)) { - HILOG_ERROR(HILOG_MODULE_ACE, "style iteration count value is invalid!"); - return; - } - trans_->iterations = TransitionImpl::GetNumIterations(strValue); + SetAnimationIterationCount(styleItem, strValue); break; } default: @@ -958,6 +1011,7 @@ void Component::AddAnimationToList(const TransitionImpl *transitionImpl) const void Component::RecordAnimation() { if (trans_ == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "failed to record animation, trans_ is nullptr"); return; } @@ -1573,6 +1627,7 @@ jerry_value_t Component::SetListForWatcher(jerry_value_t getter, jerry_value_t c jerry_value_t watcher = CallJSWatcher(getter, ListForWatcherCallbackFunc, options); if (IS_UNDEFINED(watcher) || jerry_value_is_error(watcher)) { + jerry_release_value(watcher); // release error case, note: release undefined is harmless HILOG_ERROR(HILOG_MODULE_ACE, "Failed to create ListForWatcher instance."); } else { InsertWatcherCommon(watchersHead_, watcher); @@ -1652,6 +1707,7 @@ void Component::AppendIfDescriptor(Component *parent, const jerry_value_t descri DescriptorUtils::DelIfDescriptorRendered(descriptor); } } + void Component::AppendForDescriptor(Component *parent, const jerry_value_t descriptor) { JSValue descriptorOrelements = DescriptorUtils::GetDescriptorRendered(descriptor); @@ -1665,6 +1721,7 @@ void Component::AppendForDescriptor(Component *parent, const jerry_value_t descr AppendDescriptorOrElements(parent, descriptorOrelements); } } + void Component::AppendElement(Component *parent, const jerry_value_t element) { if (parent == nullptr) { diff --git a/frameworks/src/core/components/component.h b/frameworks/src/core/components/component.h index 8b1fb42685697a7a5782aec33b441fb1fe2e6524..7194fd7a8c74f17984cdda61a9e09b8a92d0d1d3 100644 --- a/frameworks/src/core/components/component.h +++ b/frameworks/src/core/components/component.h @@ -202,7 +202,7 @@ public: TransitionImpl *transitionImpl; AnimationsNode *next; - AnimationsNode() : transitionImpl(nullptr), next(nullptr){} + AnimationsNode() : transitionImpl(nullptr), next(nullptr) {} }; static void HandlerAnimations(); @@ -593,6 +593,16 @@ private: */ void RemoveAllChildren(); + void SetAnimationDuration(const AppStyleItem *styleItem, const char *strValue); + + void SetAnimationTimingFunction(const char *strValue, size_t strLen); + + void SetAnimationFillMode(const char *strValue, size_t strLen); + + void SetAnimationDelay(const AppStyleItem *styleItem, const char *strValue); + + void SetAnimationIterationCount(const AppStyleItem *styleItem, const char *strValue); + /** * @brief childHead_ the child list */ diff --git a/frameworks/src/core/components/image_animator_component.cpp b/frameworks/src/core/components/image_animator_component.cpp index 870492223dd56c2e81de04ddfa23992caba1a3b1..6e14bd6a8e8c4028bdc80e7d27e49b41691dac47 100644 --- a/frameworks/src/core/components/image_animator_component.cpp +++ b/frameworks/src/core/components/image_animator_component.cpp @@ -337,6 +337,7 @@ jerry_value_t ImageAnimatorComponent::StartAnimator(const jerry_value_t func, return UNDEFINED; } + jerry_value_t ImageAnimatorComponent::PauseAnimator(const jerry_value_t func, const jerry_value_t dom, const jerry_value_t args[], @@ -357,6 +358,7 @@ jerry_value_t ImageAnimatorComponent::PauseAnimator(const jerry_value_t func, return UNDEFINED; } + jerry_value_t ImageAnimatorComponent::ResumeAnimator(const jerry_value_t func, const jerry_value_t dom, const jerry_value_t args[], @@ -377,6 +379,7 @@ jerry_value_t ImageAnimatorComponent::ResumeAnimator(const jerry_value_t func, return UNDEFINED; } + jerry_value_t ImageAnimatorComponent::StopAnimator(const jerry_value_t func, const jerry_value_t dom, const jerry_value_t args[], diff --git a/frameworks/src/core/components/input_button_component.cpp b/frameworks/src/core/components/input_button_component.cpp index 81d8b4b88ff443038a074f46514b83a488791c73..44b18fd415bd1dc342fb68dc92a765d88b86f45f 100644 --- a/frameworks/src/core/components/input_button_component.cpp +++ b/frameworks/src/core/components/input_button_component.cpp @@ -70,75 +70,50 @@ bool InputButtonComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t bool InputButtonComponent::ApplyPrivateStyle(const AppStyleItem *style) { - bool result = true; uint16_t styleKey = GetStylePropNameId(style); switch (styleKey) { case K_FONT_SIZE: - result = SetFontSize(style); - break; + return SetFontSize(style); case K_FONT_FAMILY: - if (IsStyleValueTypeString(style)) { - // the style would be freed after this method - result = CopyFontFamily(fontFamily_, GetStyleStrValue(style)); + if (IsStyleValueTypeString(style)) { // the style would be freed after this method + return CopyFontFamily(fontFamily_, GetStyleStrValue(style)); } else { - result = false; + return false; } - break; case K_TEXT_ALIGN: - result = SetTextAlign(style); - break; + return SetTextAlign(style); case K_COLOR: - result = SetColor(*style); - break; + return SetColor(*style); case K_BACKGROUND_COLOR: - result = SetBackgroundColor(*style); - break; + return SetBackgroundColor(*style); case K_BACKGROUND_IMAGE: - result = HandleBackgroundImg(*style, pressedBackGroundImg_, normalBackGroundImg_); - break; - case K_PADDING: - // fall through - case K_PADDING_BOTTOM: - // fall through - case K_PADDING_LEFT: - // fall through - case K_PADDING_RIGHT: - // fall through - case K_PADDING_TOP: - // fall through - case K_BORDER_BOTTOM_WIDTH: - // fall through - case K_BORDER_LEFT_WIDTH: - // fall through - case K_BORDER_RIGHT_WIDTH: - // fall through - case K_BORDER_TOP_WIDTH: - // fall through - case K_BORDER_WIDTH: - // fall through - case K_BORDER_BOTTOM_COLOR: - // fall through - case K_BORDER_LEFT_COLOR: - // fall through - case K_BORDER_RIGHT_COLOR: - // fall through - case K_BORDER_TOP_COLOR: - // fall through - case K_BORDER_COLOR: - // fall through - case K_BORDER_RADIUS: { + return HandleBackgroundImg(*style, pressedBackGroundImg_, normalBackGroundImg_); + case K_PADDING: //fall through + case K_PADDING_BOTTOM: //fall through + case K_PADDING_LEFT: //fall through + case K_PADDING_RIGHT: //fall through + case K_PADDING_TOP: //fall through + case K_BORDER_BOTTOM_WIDTH: //fall through + case K_BORDER_LEFT_WIDTH: //fall through + case K_BORDER_RIGHT_WIDTH: //fall through + case K_BORDER_TOP_WIDTH: //fall through + case K_BORDER_WIDTH: //fall through + case K_BORDER_BOTTOM_COLOR: //fall through + case K_BORDER_LEFT_COLOR: //fall through + case K_BORDER_RIGHT_COLOR: //fall through + case K_BORDER_TOP_COLOR: //fall through + case K_BORDER_COLOR: //fall through + case K_BORDER_RADIUS: { //fall through button_.SetStateForStyle(UIButton::ButtonState::PRESSED); bool pressResult = ApplyCommonStyle(button_, style); button_.SetStateForStyle(UIButton::ButtonState::RELEASED); bool releaseResult = ApplyCommonStyle(button_, style); - result = pressResult && releaseResult; - break; + return pressResult && releaseResult; } default: - result = false; - break; + return false; } - return result; + return false; } bool InputButtonComponent::SetBackgroundColor(const AppStyleItem &style) diff --git a/frameworks/src/core/components/input_button_component.h b/frameworks/src/core/components/input_button_component.h index 8b3c9fbe9b909c66717feca6a08200e89f27985d..455bd33174e8e023b93ed67ebf907e4d7b4949e8 100644 --- a/frameworks/src/core/components/input_button_component.h +++ b/frameworks/src/core/components/input_button_component.h @@ -20,9 +20,9 @@ #include "ui_label_button.h" #ifdef FEATURE_EXTRA_TEXT_X_SUPPORT #include "ui_label_button_x.h" -#define UILabelButtonTypeWrapper UILabelButtonX +#define UI_LABEL_BUTTON_TYPE_WRAPPER UILabelButtonX #else -#define UILabelButtonTypeWrapper UILabelButton +#define UI_LABEL_BUTTON_TYPE_WRAPPER UILabelButton #endif // FEATURE_EXTRA_TEXT_X_SUPPORT namespace OHOS { @@ -57,7 +57,7 @@ public: protected: UIView *GetComponentRootView() const override { - return const_cast(&button_); + return const_cast(&button_); } private: @@ -68,7 +68,7 @@ private: bool SetColor(const AppStyleItem &style); bool HandleImage(const AppStyleItem &style); jerry_value_t options_; - UILabelButtonTypeWrapper button_; + UI_LABEL_BUTTON_TYPE_WRAPPER button_; ViewOnClickListener *clickListener_; int32_t pressedBackGroundColorValue_; uint8_t pressedOpacityValue_; diff --git a/frameworks/src/core/components/input_edittext_component.cpp b/frameworks/src/core/components/input_edittext_component.cpp index 40042c06c0b459c8ac20c1f8fdd1d73bcb7d06f7..2f3b8848ab76e80de97603cf211e82476c6253e4 100644 --- a/frameworks/src/core/components/input_edittext_component.cpp +++ b/frameworks/src/core/components/input_edittext_component.cpp @@ -42,60 +42,80 @@ void InputEditTextComponent::ReleaseNativeViews() ACE_FREE(fontFamily_); } +bool InputEditTextComponent::SetInputType(const jerry_value_t& attrValue) +{ + if (jerry_value_is_string(attrValue)) { + char *type = MallocStringOf(attrValue); + if (type == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "type is nullptr"); + return false; + } + if (strcmp(type, "password")) { + edittext_.SetInputType(InputType::TEXT_TYPE); + } else { + edittext_.SetInputType(InputType::PASSWORD_TYPE); + } + ACE_FREE(type); + return true; + } + HILOG_ERROR(HILOG_MODULE_ACE, "the edittext type is error value"); + return false; +} + +bool InputEditTextComponent::SetText(const jerry_value_t& attrValue) +{ + if (jerry_value_is_string(attrValue)) { + char *value = MallocStringOf(attrValue); + if (value == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "value is nullptr"); + return false; + } + edittext_.SetText(value); + ACE_FREE(value); + return true; + } + HILOG_ERROR(HILOG_MODULE_ACE, "the edittext value is error value"); + return false; +} + +bool InputEditTextComponent::SetPlaceholder(const jerry_value_t& attrValue) +{ + if (jerry_value_is_string(attrValue)) { + char *placeholder = MallocStringOf(attrValue); + if (placeholder == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "placeholder is nullptr"); + return false; + } + edittext_.SetPlaceholder(placeholder); + ACE_FREE(placeholder); + return true; + } + HILOG_ERROR(HILOG_MODULE_ACE, "the edittext placeholder is error value"); + return false; +} + +bool InputEditTextComponent::SetMaxLength(const jerry_value_t& attrValue) +{ + if (jerry_value_is_number(attrValue)) { + uint16_t maxLenth = IntegerOf(attrValue); + edittext_.SetMaxLength(maxLenth); + return true; + } + HILOG_ERROR(HILOG_MODULE_ACE, "the edittext maxLenth is error value"); + return false; +} + bool InputEditTextComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) { switch (attrKeyId) { case K_TYPE: - if (jerry_value_is_string(attrValue)) { - char *type = MallocStringOf(attrValue); - if (type == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "type is nullptr"); - return false; - } - if (strcmp(type, "password")) { - edittext_.SetInputType(InputType::TEXT_TYPE); - } else { - edittext_.SetInputType(InputType::PASSWORD_TYPE); - } - ACE_FREE(type); - return true; - } - HILOG_ERROR(HILOG_MODULE_ACE, "the edittext type is error value"); - break; + return SetInputType(attrValue); case K_VALUE: - if (jerry_value_is_string(attrValue)) { - char *value = MallocStringOf(attrValue); - if (value == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "value is nullptr"); - return false; - } - edittext_.SetText(value); - ACE_FREE(value); - return true; - } - HILOG_ERROR(HILOG_MODULE_ACE, "the edittext value is error value"); - break; + return SetText(attrValue); case K_PLACEHOLDER: - if (jerry_value_is_string(attrValue)) { - char *placeholder = MallocStringOf(attrValue); - if (placeholder == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "placeholder is nullptr"); - return false; - } - edittext_.SetPlaceholder(placeholder); - ACE_FREE(placeholder); - return true; - } - HILOG_ERROR(HILOG_MODULE_ACE, "the edittext placeholder is error value"); - break; + return SetPlaceholder(attrValue); case K_MAX_LENGTH: - if (jerry_value_is_number(attrValue)) { - uint16_t maxLenth = IntegerOf(attrValue); - edittext_.SetMaxLength(maxLenth); - return true; - } - HILOG_ERROR(HILOG_MODULE_ACE, "the edittext maxLenth is error value"); - break; + return SetMaxLength(attrValue); default: return false; } diff --git a/frameworks/src/core/components/input_edittext_component.h b/frameworks/src/core/components/input_edittext_component.h index 707489b871abaffe8eddfb8e550a2cbc002e06af..b10b33390fac253d4a92097b5709f36181021427 100644 --- a/frameworks/src/core/components/input_edittext_component.h +++ b/frameworks/src/core/components/input_edittext_component.h @@ -56,6 +56,10 @@ private: bool SetFontSize(const AppStyleItem *style); bool SetColor(const AppStyleItem &style); bool SetPlaceholderColor(const AppStyleItem &style); + bool SetInputType(const jerry_value_t& attrValue); + bool SetText(const jerry_value_t& attrValue); + bool SetPlaceholder(const jerry_value_t& attrValue); + bool SetMaxLength(const jerry_value_t& attrValue); UIEditText edittext_; ValueChangeListener* onValueChangeListener_; char *fontFamily_; diff --git a/frameworks/src/core/components/marquee_component.cpp b/frameworks/src/core/components/marquee_component.cpp index d528506d56d1aeecdda71c38beffb40a4d3965ce..4a4c01fb7ef3ff8fc39720832e4f9f0279b90fc0 100644 --- a/frameworks/src/core/components/marquee_component.cpp +++ b/frameworks/src/core/components/marquee_component.cpp @@ -31,7 +31,7 @@ MarqueeComponent::MarqueeComponent(jerry_value_t options, jerry_value_t children bool MarqueeComponent::CreateNativeViews() { if (TextComponent::CreateNativeViews()) { - UILabelTypeWrapper *uiLabel = TextComponent::GetUILabelView(); + UI_LABEL_TYPE_WRAPPER *uiLabel = TextComponent::GetUILabelView(); if (uiLabel != nullptr) { // default mode, speed uiLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); @@ -83,7 +83,7 @@ void MarqueeComponent::SetScrolldelay(uint16_t scrolldelay) void MarqueeComponent::SetRollSpeed() { - UILabelTypeWrapper *uiLabel = TextComponent::GetUILabelView(); + UI_LABEL_TYPE_WRAPPER *uiLabel = TextComponent::GetUILabelView(); if (uiLabel != nullptr) { const int32_t supportScrolldelayApiVersion = 5; if (JsAppContext::GetInstance()->GetTargetApi() >= supportScrolldelayApiVersion) { diff --git a/frameworks/src/core/components/tab_bar_component.h b/frameworks/src/core/components/tab_bar_component.h index e306fd0e46c2498db2ff38dfe94da37d98018b5d..1ffabef9f5a1ce8d85b5fe9098ed578e81437cda 100644 --- a/frameworks/src/core/components/tab_bar_component.h +++ b/frameworks/src/core/components/tab_bar_component.h @@ -30,7 +30,7 @@ public: ACE_DISALLOW_COPY_AND_MOVE(TabBarComponent); TabBarComponent() = delete; TabBarComponent(jerry_value_t options, jerry_value_t children, AppStyleManager* styleManager); - ~TabBarComponent(){} + ~TabBarComponent() {} int16_t GetWidth() const { return width_; diff --git a/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h index cba24af5718b8a1f1a3f2d395766148416f000b7..492ee91bddca1d7e3261059041cce15496caaa76 100644 --- a/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/horizonprogress_tdd_test.h @@ -38,7 +38,7 @@ class HorizonProgressTddTest { #endif public: HorizonProgressTddTest(); - ~HorizonProgressTddTest(){} + ~HorizonProgressTddTest() {} void SetUp(); void TearDown(); void HorizonProgressTest001(); diff --git a/frameworks/src/core/components/test/unittest/common/input_tdd_test.h b/frameworks/src/core/components/test/unittest/common/input_tdd_test.h index 515107a8165fd1d4eb02571c25b8743c8c1626f2..cddf5d00f391c9e2116898d9bdad00403997aaaa 100644 --- a/frameworks/src/core/components/test/unittest/common/input_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/input_tdd_test.h @@ -26,7 +26,7 @@ namespace ACELite { class InputTddTest : public BaseTest { public: InputTddTest() {} - ~InputTddTest(){} + ~InputTddTest() {} void ComponentInputAttributeTest01(); void ComponentInputAttributeTest02(); void ComponentInputStyleTest03(); diff --git a/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h index 1010d8c2f50447f048bf4a2dee6067a941a10d85..e8d73249047ef9ac5043ed2cda13de80ef099988 100644 --- a/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/jsbundle_tdd_test.h @@ -36,7 +36,7 @@ class JsbundleTddTest { #endif public: JsbundleTddTest(); - ~JsbundleTddTest(){} + ~JsbundleTddTest() {} void SetUp(); void TearDown(); diff --git a/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp b/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp index 4ba311943d8a0f59047b87ec767a4ce8874c521f..4eb9335e8e8d577e377dcc976992bdaa064463ea 100644 --- a/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp +++ b/frameworks/src/core/components/test/unittest/common/list_tdd_test.cpp @@ -23,7 +23,7 @@ namespace ACELite { ListTddTest::ListTddTest() : objGlob(UNDEFINED), objAttrs(UNDEFINED), - objStaticStyle(UNDEFINED){} + objStaticStyle(UNDEFINED) {} void ListTddTest::SetUp() { JsAppEnvironment* appJsEnv = JsAppEnvironment::GetInstance(); diff --git a/frameworks/src/core/components/test/unittest/common/list_tdd_test.h b/frameworks/src/core/components/test/unittest/common/list_tdd_test.h index 384a3a630e6c2be85ac7bd8421c9b3ba828da50b..876ba780f529a5c6ad59df44d739f7d3a62cc6b3 100644 --- a/frameworks/src/core/components/test/unittest/common/list_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/list_tdd_test.h @@ -36,7 +36,7 @@ class ListTddTest { #endif public: ListTddTest(); - ~ListTddTest(){} + ~ListTddTest() {} void SetUp(); void TearDown(); void ListTest001(); diff --git a/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h b/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h index c5693e2e7d0d973f3a3dc993d28ac576d1a54fda..f9c4fa76d00caf4c694aee64d17a7a084bbd2a41 100644 --- a/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/picker_view_tdd_test.h @@ -44,7 +44,7 @@ class PickerViewTddTest { public: PickerViewTddTest(); - ~PickerViewTddTest(){} + ~PickerViewTddTest() {} void SetUp(); void TearDown(); Component* GetRenderedComponent(uint16_t componentKeyId) const; diff --git a/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h b/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h index 5235db1dba5d806602ba7acfa789a11f6c9abeda..7b2a45cfa69ca21b6237da148c4f379d7ee6048b 100644 --- a/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/stack_tdd_test.h @@ -44,7 +44,7 @@ class StackTddTest { #endif public: StackTddTest(); - ~StackTddTest(){} + ~StackTddTest() {} void SetUp(); void TearDown(); void ComponentStackTest001(); diff --git a/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h index b911bceec63cd5bf7c00864caf64e79e9a41623c..ab039961cba02329c9b356df891cd6e3d89154b2 100644 --- a/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/swiper_tdd_test.h @@ -38,7 +38,7 @@ class SwiperTddTest { #endif public: SwiperTddTest(); - ~SwiperTddTest(){} + ~SwiperTddTest() {} void SetUp(); void TearDown(); void ComponentSwiperAttributeSetTest001(); diff --git a/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h index 5556d10e10ce87b580cee132fcc27ea9a6c1a41b..446a66ab6d4a4e11861762740179fa13689295bc 100644 --- a/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h +++ b/frameworks/src/core/components/test/unittest/common/switch_tdd_test.h @@ -37,7 +37,7 @@ class SwitchTddTest { #endif public: SwitchTddTest(); - ~SwitchTddTest(){} + ~SwitchTddTest() {} void SetUp(); void TearDown(); void ComponentSwitchAttributeSetTest001(); diff --git a/frameworks/src/core/components/text_component.cpp b/frameworks/src/core/components/text_component.cpp index 82dab9c9bd8fdf330976604f69a76c26eb212cbf..8c979c82de3cb015aaa2ec0b1a54856e894b47e6 100644 --- a/frameworks/src/core/components/text_component.cpp +++ b/frameworks/src/core/components/text_component.cpp @@ -70,12 +70,12 @@ void TextComponent::ReleaseNativeViews() inline UIView *TextComponent::GetComponentRootView() const { - return const_cast(&uiLabel_); + return const_cast(&uiLabel_); } -UILabelTypeWrapper *TextComponent::GetUILabelView() const +UI_LABEL_TYPE_WRAPPER *TextComponent::GetUILabelView() const { - return const_cast(&uiLabel_); + return const_cast(&uiLabel_); } bool TextComponent::SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) @@ -224,17 +224,17 @@ bool TextComponent::ApplyPrivateStyle(const AppStyleItem *styleItem) return true; } -void TextComponent::SetTextLetterSpace(UILabelTypeWrapper &label, const AppStyleItem *styleItem) const +void TextComponent::SetTextLetterSpace(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) const { label.SetStyle(STYLE_LETTER_SPACE, (int16_t)GetStylePixelValue(styleItem)); } -void TextComponent::SetTextLineHeight(UILabelTypeWrapper &label, const AppStyleItem *styleItem) const +void TextComponent::SetTextLineHeight(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) const { label.SetStyle(STYLE_LINE_HEIGHT, (int16_t)GetStylePixelValue(styleItem)); } -void TextComponent::SetTextOverflow(UILabelTypeWrapper &label, const AppStyleItem *styleItem) +void TextComponent::SetTextOverflow(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) { if (!IsStyleValueTypeString(styleItem)) { HILOG_ERROR(HILOG_MODULE_ACE, "text overflow style value is invalid!"); @@ -263,7 +263,7 @@ void TextComponent::SetTextOverflow(UILabelTypeWrapper &label, const AppStyleIte label.SetLineBreakMode(overflowMode_); } -void TextComponent::SetTextColor(UILabelTypeWrapper &label, const AppStyleItem *styleItem) const +void TextComponent::SetTextColor(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) const { uint32_t color = 0; uint8_t alpha = OPA_OPAQUE; @@ -332,7 +332,7 @@ void TextComponent::PostUpdate(uint16_t attrKeyId) } } -void TextComponent::SetTextAlign(UILabelTypeWrapper &label, const AppStyleItem *styleItem) +void TextComponent::SetTextAlign(UI_LABEL_TYPE_WRAPPER &label, const AppStyleItem *styleItem) { if (!IsStyleValueTypeString(styleItem)) { HILOG_ERROR(HILOG_MODULE_ACE, "text text align style value is invalid!"); @@ -359,7 +359,7 @@ void TextComponent::SetTextAlign(UILabelTypeWrapper &label, const AppStyleItem * UpdateTextAlignToLabel(label); } -void TextComponent::UpdateTextAlignToLabel(UILabelTypeWrapper& label) +void TextComponent::UpdateTextAlignToLabel(UI_LABEL_TYPE_WRAPPER& label) { const int32_t defaultVerticalAlignCenterApiVersion = 5; if (JsAppContext::GetInstance()->GetTargetApi() < defaultVerticalAlignCenterApiVersion) { diff --git a/frameworks/src/core/components/text_component.h b/frameworks/src/core/components/text_component.h index 2f6b5f7cfcab64dda93ecfe156cc192c6477893e..8985a9c6fde014d30b66358163e5d686206b8fdf 100644 --- a/frameworks/src/core/components/text_component.h +++ b/frameworks/src/core/components/text_component.h @@ -23,9 +23,9 @@ #include "ui_label.h" #ifdef FEATURE_EXTRA_TEXT_X_SUPPORT #include "ui_label_x.h" -#define UILabelTypeWrapper UILabelX +#define UI_LABEL_TYPE_WRAPPER UILabelX #else -#define UILabelTypeWrapper UILabel +#define UI_LABEL_TYPE_WRAPPER UILabel #endif // FEATURE_EXTRA_TEXT_X_SUPPORT namespace OHOS { @@ -66,28 +66,28 @@ protected: UIView *GetComponentRootView() const override; bool SetPrivateAttribute(uint16_t attrKeyId, jerry_value_t attrValue) override; bool ApplyPrivateStyle(const AppStyleItem* styleItem) override; - UILabelTypeWrapper *GetUILabelView() const; + UI_LABEL_TYPE_WRAPPER *GetUILabelView() const; void OnViewAttached() override; void PostUpdate(uint16_t attrKeyId) override; private: // parse js text align style to ui_label - void SetTextAlign(UILabelTypeWrapper& label, const AppStyleItem* styleItem); - void UpdateTextAlignToLabel(UILabelTypeWrapper& label); + void SetTextAlign(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem); + void UpdateTextAlignToLabel(UI_LABEL_TYPE_WRAPPER& label); // parse js text size style to fontSize_ void SetTextSize(const AppStyleItem* styleItem); // parse js text color style to ui_label - void SetTextColor(UILabelTypeWrapper& label, const AppStyleItem* styleItem) const; + void SetTextColor(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem) const; // parse js text overflow style to ui_label - void SetTextOverflow(UILabelTypeWrapper& label, const AppStyleItem* styleItem); + void SetTextOverflow(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem); // parse js text letter space style to ui_label - void SetTextLetterSpace(UILabelTypeWrapper& label, const AppStyleItem* styleItem) const; + void SetTextLetterSpace(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem) const; // parse js text line height style to ui_label - void SetTextLineHeight(UILabelTypeWrapper& label, const AppStyleItem* styleItem) const; + void SetTextLineHeight(UI_LABEL_TYPE_WRAPPER& label, const AppStyleItem* styleItem) const; #if FEATURE_COMPONENT_TEXT_SPANNABLE void SetRichTextSpan(); #endif - UILabelTypeWrapper uiLabel_; + UI_LABEL_TYPE_WRAPPER uiLabel_; uint8_t fontSize_; char* fontFamily_; char* textValue_; diff --git a/frameworks/src/core/components/video_view.cpp b/frameworks/src/core/components/video_view.cpp index fb59e3984bad655617f69cce74851868ee21c73e..c974fbed8eacbd3e47917ef7e465600dceda68ae 100644 --- a/frameworks/src/core/components/video_view.cpp +++ b/frameworks/src/core/components/video_view.cpp @@ -503,13 +503,13 @@ void VideoView::FormatTime(uint32_t inSeconds, char *outBuffer, uint8_t bufferLe return; } if (hours == 0) { - if (sprintf_s(outBuffer, bufferLength, "%02d:%02d", minutes, seconds) < 0) { + if (sprintf_s(outBuffer, bufferLength, "%02hhu:%02hhu", minutes, seconds) < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "xx:xx transfer error"); return; } outBuffer[minBufferLength - 1] = '\0'; } else { - if (sprintf_s(outBuffer, bufferLength, "%02d:%02d:%02d", hours, minutes, seconds) < 0) { + if (sprintf_s(outBuffer, bufferLength, "%02hhu:%02hhu:%02hhu", hours, minutes, seconds) < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "xx:xx:xx transfer error"); return; } diff --git a/frameworks/src/core/context/fatal_handler.cpp b/frameworks/src/core/context/fatal_handler.cpp index 49a16a29772b3428a655374b021462a2ef4613a0..0dbba29e92007c7698a122befbc3d6de3f18c3df 100644 --- a/frameworks/src/core/context/fatal_handler.cpp +++ b/frameworks/src/core/context/fatal_handler.cpp @@ -55,7 +55,7 @@ static void HandleFatal(int errorCode) #if (FEATURE_FATAL_ERROR_HANDLING == 1) HILOG_ERROR(HILOG_MODULE_ACE, "hitted by fatal error[%{public}d]", errorCode); if (FatalHandler::GetInstance().IsFatalErrorHitted()) { - // fatal hitted again during one fatal handing, return to avoid dead loop + HILOG_ERROR(HILOG_MODULE_ACE, "fatal hitted again during one fatal handing, return to avoid dead loop"); return; } // record error code diff --git a/frameworks/src/core/context/js_framework_raw.cpp b/frameworks/src/core/context/js_framework_raw.cpp index 7498091f7edceb4ab9ca0a828ff6c7072bf03337..952919626cbf4dbf5563028f37508a155c4148a7 100644 --- a/frameworks/src/core/context/js_framework_raw.cpp +++ b/frameworks/src/core/context/js_framework_raw.cpp @@ -28,8 +28,8 @@ namespace ACELite { const char *GetFrameworkRawBuffer(bool snapshotMode, size_t &bufLen) { if (snapshotMode) { - bufLen = sizeof(g_frameworkBCBuffer); - return reinterpret_cast(g_frameworkBCBuffer); + bufLen = sizeof(FRAMEWORK_BC_BUFFER); + return reinterpret_cast(FRAMEWORK_BC_BUFFER); } bufLen = strlen(g_frameworkJSBuffer); return g_frameworkJSBuffer; diff --git a/frameworks/src/core/context/js_profiler.cpp b/frameworks/src/core/context/js_profiler.cpp index 9d5773aa8e5c1191db9c91d39228683f7f4becd8..ff905b05eaf35fba4758f2b2f89bd9c09db191e6 100644 --- a/frameworks/src/core/context/js_profiler.cpp +++ b/frameworks/src/core/context/js_profiler.cpp @@ -225,7 +225,7 @@ void JSProfiler::FlushProfilerMsg(void *data) return; } - int32_t fd = open(fullPath, O_CREAT | O_RDWR); + int32_t fd = open(fullPath, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR); if (fd < 0) { HILOG_ERROR(HILOG_MODULE_ACE, "ace js profiler open error"); ace_free(fullPath); diff --git a/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h index 0a0345ac75d3ce8299d72e8c885ff2896a8d5b09..91f7718d2b58fc383a4f33d78b19978d1c6baf3b 100644 --- a/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h +++ b/frameworks/src/core/context/test/unittest/common/jsfwk_tdd_test.h @@ -36,7 +36,7 @@ class JSfwkTddTest { #endif public: JSfwkTddTest(); - ~JSfwkTddTest(){} + ~JSfwkTddTest() {} void SetUp(); void TearDown(); void JudeTestCaseResult() const; diff --git a/frameworks/src/core/dialog/js_dialog.cpp b/frameworks/src/core/dialog/js_dialog.cpp index 18572e3b190d2fa9a005461ff2f696e5fd43e049..6bc9722a2a0c90781d789d5c3767cbddf2e93ffb 100644 --- a/frameworks/src/core/dialog/js_dialog.cpp +++ b/frameworks/src/core/dialog/js_dialog.cpp @@ -46,6 +46,7 @@ void JSDialog::SetTitle(char *title) { title_ = title; } + void JSDialog::SetMessage(char *message) { message_ = message; diff --git a/frameworks/src/core/modules/presets/app_data_module.cpp b/frameworks/src/core/modules/presets/app_data_module.cpp index 6966cf0731c44a34c598234d67c7fa0b2e3391f2..a04cb61b81bdf78e38b57c53fd9b35f93834259f 100644 --- a/frameworks/src/core/modules/presets/app_data_module.cpp +++ b/frameworks/src/core/modules/presets/app_data_module.cpp @@ -22,11 +22,11 @@ namespace OHOS { namespace ACELite { -const char * const AppDataModule::GETAPP_METHOD_NAME = "getApp"; -const char * const AppDataModule::GETAPP_DATA_STR = "data"; +const char * const AppDataModule::getAppMethodName = "getApp"; +const char * const AppDataModule::getAppDataStr = "data"; void AppDataModule::Init() { - CreateNamedFunction(GETAPP_METHOD_NAME, GetApp); + CreateNamedFunction(getAppMethodName, GetApp); } jerry_value_t AppDataModule::GetApp(const jerry_value_t func, @@ -52,7 +52,7 @@ jerry_value_t AppDataModule::GetApp(const jerry_value_t func, return UNDEFINED; } - jerry_value_t dataObj = jerryx_get_property_str(abilityVM, GETAPP_DATA_STR); + jerry_value_t dataObj = jerryx_get_property_str(abilityVM, getAppDataStr); if (IS_UNDEFINED(dataObj)) { return UNDEFINED; } diff --git a/frameworks/src/core/modules/presets/app_data_module.h b/frameworks/src/core/modules/presets/app_data_module.h index dfba14ddb87b9d50e8a8b2b3bbfae2f9b745abc3..ec7461d1244651009a8eb4bcdc234ac6c84fee55 100644 --- a/frameworks/src/core/modules/presets/app_data_module.h +++ b/frameworks/src/core/modules/presets/app_data_module.h @@ -54,8 +54,8 @@ private: const jerry_value_t context, const jerry_value_t args[], const jerry_length_t argsNum); - static const char * const GETAPP_METHOD_NAME; - static const char * const GETAPP_DATA_STR; + static const char * const getAppMethodName; + static const char * const getAppDataStr; }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/modules/presets/cjson_parser.cpp b/frameworks/src/core/modules/presets/cjson_parser.cpp index 47ba7adbaab46a8fe0df8bf69d2097f7b91c34dd..d4974364123878c91db6f566a658572a06b9745f 100644 --- a/frameworks/src/core/modules/presets/cjson_parser.cpp +++ b/frameworks/src/core/modules/presets/cjson_parser.cpp @@ -426,7 +426,7 @@ bool CJSONParser::IsFileExistFullMatch(const char *fileName) return false; } bool canBeFullMatched = false; - for (uint8_t i = 0; i <= count; i++) { + for (int i = 0; i <= count; i++) { if (!strcmp(fileName, GetNode(fileList, i))) { canBeFullMatched = true; break; @@ -653,13 +653,20 @@ jerry_value_t CJSONParser::GetValueFromFile(const char *key, ListNode *keys = nullptr; uint8_t keyCount = Split(key, '.', *&keys); char *content = ReadJSFile(filePath_, languageFile); + if (content == nullptr) { + ClearNode(keys); + return UNDEFINED; + } cJSON *fileJson = cJSON_Parse(content); ACE_FREE(content); + if (fileJson == nullptr) { + ClearNode(keys); + return UNDEFINED; + } cJSON *curJsonItem = fileJson; uint8_t curKeyIndex = 0; do { - // get the current splited key - char *message = CJSONParser::GetNode(keys, keyCount - curKeyIndex); + char *message = CJSONParser::GetNode(keys, keyCount - curKeyIndex); // get the current splited key curJsonItem = cJSON_GetObjectItemCaseSensitive(curJsonItem, message); curKeyIndex++; } while (!(curKeyIndex == keyCount || (curJsonItem == nullptr))); @@ -675,18 +682,14 @@ jerry_value_t CJSONParser::GetValueFromFile(const char *key, } char *value = FillPlaceholder(curJsonItem->valuestring, args, argsNum); if (value == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "get nullptr value after place holder filling, keyLen[%{public}d]", - strlen(key)); nullValueFlag = true; break; } if (strlen(value) == 0) { - HILOG_ERROR(HILOG_MODULE_ACE, "warning: get 0 length str after place holder filling, keyLen[%{public}d]", - strlen(key)); + HILOG_ERROR(HILOG_MODULE_ACE, "get 0 length str after place holder filling"); } result = jerry_create_string(reinterpret_cast(value)); - ace_free(value); - value = nullptr; + ACE_FREE(value); } while (0); cJSON_Delete(fileJson); fileJson = nullptr; diff --git a/frameworks/src/core/modules/presets/console_log_impl.cpp b/frameworks/src/core/modules/presets/console_log_impl.cpp index 220bd6aa76cf1d12507acbfcafdcc2f4dcaf01ce..7852dbb3bd1745cad4e8551b7cf5f5fa098764f2 100644 --- a/frameworks/src/core/modules/presets/console_log_impl.cpp +++ b/frameworks/src/core/modules/presets/console_log_impl.cpp @@ -143,9 +143,9 @@ static uint16_t logBufferIndex = 0; void LogChar(char c, const LogLevel logLevel, bool endFlag) { #if (defined(TARGET_SIMULATOR) && (TARGET_SIMULATOR == 1)) - char tempBuffer[2] = {0}; - tempBuffer[0] = c; - Output(logLevel, tempBuffer, 1); + char tempBuffer[2] = {0}; + tempBuffer[0] = c; + Output(logLevel, tempBuffer, 1); #else logBuffer[logBufferIndex++] = c; if ((logBufferIndex == (LOG_BUFFER_SIZE - 1)) || (c == '\n')) { diff --git a/frameworks/src/core/modules/presets/feature_ability_module.cpp b/frameworks/src/core/modules/presets/feature_ability_module.cpp index 677d3570a7ff4cd1acc6ec8f30f2c487708af79b..035b6ac9bcbd97e30cf5ab28522949e28ee4dd89 100644 --- a/frameworks/src/core/modules/presets/feature_ability_module.cpp +++ b/frameworks/src/core/modules/presets/feature_ability_module.cpp @@ -328,7 +328,6 @@ void FeatureAbilityModule::CopySuccessMessage(const FeatureAbilityDataInfo *orig } } } - if (origin->bundleName != nullptr) { bufSize = strlen(origin->bundleName); if (bufSize < NAME_LENGTH_MAX) { @@ -341,7 +340,6 @@ void FeatureAbilityModule::CopySuccessMessage(const FeatureAbilityDataInfo *orig } } } - if (origin->abilityName != nullptr) { bufSize = strlen(origin->abilityName); if (bufSize < NAME_LENGTH_MAX) { @@ -354,7 +352,6 @@ void FeatureAbilityModule::CopySuccessMessage(const FeatureAbilityDataInfo *orig } } } - if ((origin->message != nullptr) && (origin->messageLength > 0) && (origin->messageLength < UINT16_MAX)) { bufSize = origin->messageLength; char *buffer = static_cast(ace_malloc(sizeof(char) * (bufSize + 1))); @@ -369,6 +366,7 @@ void FeatureAbilityModule::CopySuccessMessage(const FeatureAbilityDataInfo *orig } } } + int32_t FeatureAbilityModule::MessageFailCallback(const void *data, uint16_t dataLength, uint16_t errorCode) { if (FatalHandler::GetInstance().IsFatalErrorHitted()) { diff --git a/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp index 7c7e555077695b481ff70433d2a684a1d81a289a..d115a7c466ff003530a0ed2bb36dcf7e53af33da 100644 --- a/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp +++ b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.cpp @@ -615,6 +615,13 @@ void DfxTddTest::DfxTest002() TDD_CASE_END(); return; } + + OnDfxTest002(backtraceVal, page, stackMsgMaxLength, exceptLength); +} + +void DfxTddTest::OnDfxTest002(jerry_value_t& backtraceVal, JSValue& page, + const uint16_t stackMsgMaxLength, const uint8_t exceptLength) +{ uint32_t length = jerry_get_array_length(backtraceVal); EXPECT_EQ(length, exceptLength); jerry_char_t *errStrBuffer = static_cast(ace_malloc(sizeof(jerry_char_t) * (stackMsgMaxLength))); diff --git a/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h index 5cea029b30e864bffcb1eed3c3938b4a2dcea3c8..51e93f1a91831c3c78010306a49f8909a28b578d 100644 --- a/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h +++ b/frameworks/src/core/modules/test/unittest/common/dfx_tdd_test.h @@ -34,6 +34,9 @@ public: void DfxTest007(); void RunTests(); private: + void OnDfxTest002(jerry_value_t& backtraceVal, JSValue& page, + const uint16_t stackMsgMaxLength, const uint8_t exceptLength); + static const char * const BUNDLE1; static const char * const BUNDLE2; static const char * const BUNDLE3; diff --git a/frameworks/src/core/router/js_page_state_machine.cpp b/frameworks/src/core/router/js_page_state_machine.cpp index 9e3e2c2f65fec4dea4f1a1885b358a754fd94f00..3b42b5bfef214b089d6fba9eec9ec7f1f5db1d2c 100644 --- a/frameworks/src/core/router/js_page_state_machine.cpp +++ b/frameworks/src/core/router/js_page_state_machine.cpp @@ -442,11 +442,6 @@ void StateMachine::ReleaseRootObject() const void StateMachine::ReleaseHistoryPageResource() { - // remove all native views and release components styles. - if (appContext_ != nullptr) { - appContext_->ReleaseStyles(); - appContext_->ReleaseLazyLoadManager(); - } // release scroll layer object. if (scrollLayer_ != nullptr) { if (!isEntireHidden_) { @@ -479,6 +474,12 @@ void StateMachine::ReleaseHistoryPageResource() if (remainComponentCount != 0) { HILOG_ERROR(HILOG_MODULE_ACE, "[%{public}d] components leaked!", remainComponentCount); } + + // remove all native views and release components styles. + if (appContext_ != nullptr) { + appContext_->ReleaseStyles(); + appContext_->ReleaseLazyLoadManager(); + } } void StateMachine::DeleteViewModelProperties() const diff --git a/frameworks/src/core/router/js_router.cpp b/frameworks/src/core/router/js_router.cpp index 40c45a20344fb1a765bafa646a987b17c510c403..9fb75f55aee6dd03625183d3f8c2981a2ea1a78a 100644 --- a/frameworks/src/core/router/js_router.cpp +++ b/frameworks/src/core/router/js_router.cpp @@ -40,26 +40,38 @@ static void ReplaceAsync(void *data) jerry_value_t Router::Replace(jerry_value_t object, bool async) { if (newSm_ != nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "router is replacing, can not handle the new request"); - return UNDEFINED; - } - StateMachine *newSm = new StateMachine(); - if (newSm == nullptr) { - HILOG_ERROR(HILOG_MODULE_ACE, "malloc state machine memory heap failed."); - return UNDEFINED; + if (taskID_ != DISPATCH_FAILURE) { + AsyncTaskManager::GetInstance().Cancel(taskID_); + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "router is replacing, can not handle the new request"); + return UNDEFINED; + } } - // init new state machine + jerry_value_t jsRes = jerry_create_undefined(); - bool res = newSm->Init(object, jsRes); - if (!res) { - delete newSm; - return jsRes; + if (newSm_ == nullptr) { + StateMachine *newSm = new StateMachine(); + if (newSm == nullptr) { + HILOG_ERROR(HILOG_MODULE_ACE, "malloc state machine memory heap failed."); + return UNDEFINED; + } + + // init new state machine + bool res = newSm->Init(object, jsRes); + if (!res) { + delete newSm; + return jsRes; + } + newSm_ = newSm; + } else { + HILOG_ERROR(HILOG_MODULE_ACE, "consume asynchronous tasks in the task queue first.async:%d", async); } - newSm_ = newSm; + // dispatch the new page rendering to the async handling as the current context of // router.replace need to be released, which need to return out from the scope if (async) { - if (DISPATCH_FAILURE == AsyncTaskManager::GetInstance().Dispatch(ReplaceAsync, this)) { + taskID_ = AsyncTaskManager::GetInstance().Dispatch(ReplaceAsync, this); + if (DISPATCH_FAILURE == taskID_) { // request replacing failed, no chance to do it, release the new state machine HILOG_ERROR(HILOG_MODULE_ACE, "dispatch replacing request failed"); delete newSm_; @@ -74,6 +86,7 @@ jerry_value_t Router::Replace(jerry_value_t object, bool async) void Router::ReplaceSync() { + taskID_ = DISPATCH_FAILURE; if (newSm_ == nullptr) { HILOG_ERROR(HILOG_MODULE_ACE, "replace sync failed, new sm should be prepared"); return; diff --git a/frameworks/src/core/router/js_router.h b/frameworks/src/core/router/js_router.h index fa561a6939bafebdd5eff1b5025fa352ef79463f..6a2fb6d043f9cd9f975ce65e4f25066b13b1b442 100644 --- a/frameworks/src/core/router/js_router.h +++ b/frameworks/src/core/router/js_router.h @@ -23,7 +23,7 @@ namespace ACELite { class Router final : public MemoryHeap { public: ACE_DISALLOW_COPY_AND_MOVE(Router); - Router() : currentSm_(nullptr), newSm_(nullptr), hidden_(false) {} + Router() : currentSm_(nullptr), newSm_(nullptr), hidden_(false), taskID_(DISPATCH_FAILURE) {} ~Router() { if (currentSm_ != nullptr) { @@ -39,6 +39,7 @@ private: StateMachine *currentSm_; // current state machine for current shown page StateMachine *newSm_; // current state machine for target showing page bool hidden_; // the flag representing whether the whole app is moved to background + uint16_t taskID_; }; } // namespace ACELite } // namespace OHOS diff --git a/frameworks/src/core/stylemgr/condition_arbitrator.cpp b/frameworks/src/core/stylemgr/condition_arbitrator.cpp index f54981157cd547c32ac28aabe251c144c6b5b67c..b85cef04ab7e862fe4eb5122494c565ef8070365 100644 --- a/frameworks/src/core/stylemgr/condition_arbitrator.cpp +++ b/frameworks/src/core/stylemgr/condition_arbitrator.cpp @@ -33,6 +33,8 @@ constexpr uint32_t SPACE_CHAR_LIMIT_SCOPE = 5; constexpr int32_t SLICE_FROM_CURRENT_POS = 0; constexpr uint8_t MAX_LENGTH_PER_CONDITION = 32; constexpr uint8_t MAX_LENGTH_PER_CONDITION_ADD_BRACKETS = 35; +constexpr uint8_t ASSICLL_DIGIT_START = 48; +constexpr uint8_t ASSICLL_DIGIT_END = 57; /** * @brief Absolute value of x. @@ -165,7 +167,7 @@ bool ConditionArbitrator::JudgeConditionByStrValue(ConditionName conditionId, co bool ConditionArbitrator::JudgeConditionByNumberValue(ConditionName conditionId, const char *targetValue) const { // must be started with number character - if (!(targetValue[0] >= 48 && targetValue[0] <= 57)) { + if (!(targetValue[0] >= ASSICLL_DIGIT_START && targetValue[0] <= ASSICLL_DIGIT_END)) { return false; } switch (conditionId) { diff --git a/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h index f519ae3fa24921df250827054a485e1fc3fb08c5..bb0d2a96d568ff56970cc2c3c693ccb2e6ac042d 100644 --- a/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h +++ b/frameworks/src/core/stylemgr/test/unittest/common/stylemgr_tdd_test.h @@ -41,7 +41,7 @@ class StyleMgrTddTest { #endif public: StyleMgrTddTest(); - ~StyleMgrTddTest(){} + ~StyleMgrTddTest() {} void SetUp(); void TearDown(); void TestCaseB(const char* name) const; diff --git a/frameworks/targets/BUILD.gn b/frameworks/targets/BUILD.gn index adb5ffb16c79015ad2a3325ef0669edba4674005..43d31f81cdb6627a3f9ae7a0219546ec9a233c63 100644 --- a/frameworks/targets/BUILD.gn +++ b/frameworks/targets/BUILD.gn @@ -15,11 +15,11 @@ import("//build/lite/config/component/lite_component.gni") import("//foundation/arkui/ace_engine_lite/ace_lite.gni") declare_args() { - enable_ohos_ace_engine_lite_product_config = false + ace_engine_lite_feature_product_config = false } config("ace_lite_target_config") { - if (enable_ohos_ace_engine_lite_product_config) { + if (ace_engine_lite_feature_product_config) { defines = [ "ENABLE_OHOS_ACELITE_PRODUCT_CONFIG=1" ] } include_dirs = [ "$product_path/ace_lite_config" ] diff --git a/frameworks/targets/linux/acelite_config.h b/frameworks/targets/linux/acelite_config.h index 0028c949fb2d3fb85a3d7586346398a4d2221910..ba33f32edb36b1a646769097d76a5a01c65250f2 100644 --- a/frameworks/targets/linux/acelite_config.h +++ b/frameworks/targets/linux/acelite_config.h @@ -120,8 +120,10 @@ #ifdef FEATURE_COMPONENT_CAMERA #error "must keep the global configuration unique" #else +#ifdef ACE_ENGINE_LITE_CAMERA_LITE_ENABLE #define FEATURE_COMPONENT_CAMERA 1 #endif +#endif #ifdef FEATURE_COMPONENT_EDITTEXT #error "must keep the global configuration unique" @@ -132,8 +134,10 @@ #ifdef FEATURE_COMPONENT_VIDEO #error "must keep the global configuration unique" #else +#ifdef ACE_ENGINE_LITE_MEDIA_LITE_ENABLE #define FEATURE_COMPONENT_VIDEO 1 #endif +#endif #define FEATURE_UPDATE_VIDEO_PROGRESS_ASYNC 1 diff --git a/frameworks/targets/liteos_a/acelite_config.h b/frameworks/targets/liteos_a/acelite_config.h index 219020a70ad8cda56637d093df68b6650af3875b..616293acad4e09d0f0f491d59d2be23daf915e2e 100644 --- a/frameworks/targets/liteos_a/acelite_config.h +++ b/frameworks/targets/liteos_a/acelite_config.h @@ -87,8 +87,10 @@ * support battery API for JS */ #ifndef FEATURE_MODULE_BATTERY +#ifdef ACE_ENGINE_LITE_BATTERY_LITE_ENABLE #define FEATURE_MODULE_BATTERY 1 #endif +#endif /** * support device API for JS @@ -145,8 +147,10 @@ #endif #ifndef FEATURE_COMPONENT_CAMERA +#ifdef ACE_ENGINE_LITE_CAMERA_LITE_ENABLE #define FEATURE_COMPONENT_CAMERA 1 #endif +#endif /** * enable edittext component Feature @@ -160,8 +164,10 @@ #endif #ifndef FEATURE_COMPONENT_VIDEO +#ifdef ACE_ENGINE_LITE_MEDIA_LITE_ENABLE #define FEATURE_COMPONENT_VIDEO 1 #endif +#endif #ifndef FEATURE_MODULE_DIALOG #define FEATURE_MODULE_DIALOG 1 diff --git a/frameworks/targets/liteos_m/acelite_config.h b/frameworks/targets/liteos_m/acelite_config.h index bba2983ef3313ed1a35b7c9cd02f52e3776bb1ca..24e2b80cd144c55c144e5a9059c23219fb1b448c 100644 --- a/frameworks/targets/liteos_m/acelite_config.h +++ b/frameworks/targets/liteos_m/acelite_config.h @@ -244,8 +244,10 @@ #endif #ifndef FEATURE_MODULE_BATTERY +#ifdef ACE_ENGINE_LITE_BATTERY_LITE_ENABLE #define FEATURE_MODULE_BATTERY 0 #endif +#endif #ifndef FEATURE_MODULE_CONFIGURATION #define FEATURE_MODULE_CONFIGURATION 0 diff --git a/frameworks/targets/simulator/BUILD.gn b/frameworks/targets/simulator/BUILD.gn index 48a505fc787bce27ff13d920719ae7f6eb79fd31..371e8b91a23e5b3f1ae409b5d09242af8a39a10d 100644 --- a/frameworks/targets/simulator/BUILD.gn +++ b/frameworks/targets/simulator/BUILD.gn @@ -66,7 +66,7 @@ if (os_level == "standard") { } else { defines += [ "JS_PROFILER=0" ] } - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { defines += [ "ABILITY_WINDOW_SUPPORT" ] } } diff --git a/frameworks/tools/profiler/js_profiler.py b/frameworks/tools/profiler/js_profiler.py index cd8799350d2113b33fb541334791618328b85ef4..a730803d4a415314440cfc67e65f24961decea26 100644 --- a/frameworks/tools/profiler/js_profiler.py +++ b/frameworks/tools/profiler/js_profiler.py @@ -16,6 +16,8 @@ import sys import argparse +import os +import stat from js_profiler_config import key_word from js_profiler_config import label_name @@ -44,7 +46,9 @@ def add_description_info(description_id): def parser(opt): source_file = opt.source try: - with open(source_file, 'r') as source: + flags = os.O_WRONLY | os.O_CREAT + modes = stat.S_IWUSR | stat.S_IRUSR + with os.fdopen(os.open(source_file, flags, modes), 'w') as source: for line in source.readlines(): strlist = line.split(' ') if len(strlist) == 5: @@ -62,7 +66,9 @@ def parser(opt): def output(msg, dest): try: - with open(dest, 'a+') as destination: + flags = os.O_WRONLY | os.O_CREAT | os.O_APPEND + modes = stat.S_IWUSR | stat.S_IRUSR + with os.fdopen(os.open(dest, flags, modes), 'a+') as destination: destination.write(msg + '\n') except Exception: print('open destination file error') diff --git a/frameworks/tools/snapshot/framework2char.py b/frameworks/tools/snapshot/framework2char.py index eda1441377074bd422ee73f8b65e4f6ccc4db3fd..b91ec749d15bb01823c4421760b7c93333ccd22e 100644 --- a/frameworks/tools/snapshot/framework2char.py +++ b/frameworks/tools/snapshot/framework2char.py @@ -14,6 +14,7 @@ # limitations under the License. import os +import stat import getopt import sys @@ -64,9 +65,13 @@ def output_check_notes(output): def convert_bc(): - with open(FRAMEWORK_SNAPSHOT_FILE_PATH, 'rb') as input_file: + input_flags = os.O_WRONLY | os.O_CREAT + input_modes = stat.S_IWUSR | stat.S_IRUSR + with os.fdopen(os.open(FRAMEWORK_SNAPSHOT_FILE_PATH, input_flags, input_modes), 'rb') as input_file: byte_code_buffer = input_file.read() - with open(SNAPSHOT_OUTPUT_C_FILE_PATH, 'w') as output: + flags = os.O_WRONLY | os.O_CREAT + modes = stat.S_IWUSR | stat.S_IRUSR + with os.fdopen(os.open(SNAPSHOT_OUTPUT_C_FILE_PATH, flags, modes), 'w') as output: output_copyright(output) output.write("#ifndef OHOS_ACELITE_FRAMEWORK_MIN_BC_H\n") output.write("#define OHOS_ACELITE_FRAMEWORK_MIN_BC_H\n") @@ -76,7 +81,7 @@ def convert_bc(): "#ifndef OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER\n") output.write( "#define OHOS_ACELITE_FRAMEWORK_MIN_SNAPSHOT_BUFFER\n") - output.write("const uint8_t g_frameworkBCBuffer[] =\n{\n ") + output.write("const uint8_t FRAMEWORK_BC_BUFFER[] =\n{\n ") index = 1 max_count = len(byte_code_buffer) for data in byte_code_buffer: @@ -100,9 +105,11 @@ def convert_bc(): def convert_js(): - with open(FRAMEWORK_JS_FILE_PATH, 'r') as input_file: + flags = os.O_WRONLY | os.O_CREAT + modes = stat.S_IWUSR | stat.S_IRUSR + with os.fdopen(os.open(FRAMEWORK_JS_FILE_PATH, flags, modes), 'r') as input_file: javascript_buffer = input_file.read() - with open(JS_OUTPUT_C_FILE_PATH, 'w') as output: + with os.fdopen(os.open(JS_OUTPUT_C_FILE_PATH, flags, modes), 'w') as output: output_copyright(output) output.write("#ifndef OHOS_ACELITE_FRAMEWORK_MIN_JS_H\n") output.write("#define OHOS_ACELITE_FRAMEWORK_MIN_JS_H\n") diff --git a/frameworks/tools/syscap/syscap_native_api_src_gen.py b/frameworks/tools/syscap/syscap_native_api_src_gen.py index 315344a1489209da5f9b612727a0c9bddb725f38..3d739e22137f682a8930b534d7bb2f32cea13ce9 100644 --- a/frameworks/tools/syscap/syscap_native_api_src_gen.py +++ b/frameworks/tools/syscap/syscap_native_api_src_gen.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os +import stat import json import argparse @@ -87,20 +89,20 @@ def parse_args(): def get_syscap_list(): path = parse_args().syscap_file - syscap_file = open(path, 'rb') - syscap_json = json.load(syscap_file)['syscap'] - syscap_file.close() - syscap_list = syscap_json['os'] - if ('private' in syscap_json): - for i in syscap_json['private']: - syscap_list.append(i) + with open(path, 'rb') as syscap_file: + syscap_json = json.load(syscap_file)['syscap'] + syscap_file.close() + syscap_list = syscap_json['os'] + if ('private' in syscap_json): + for i in syscap_json['private']: + syscap_list.append(i) return syscap_list def assemble_syscap_array(): string = "static const SysCapDef g_syscap[] = {\n" for i in get_syscap_list(): - string = string + ' {' + '"' + i + '", ENABLE},\n' - string = string.strip(',\n') + '\n};\n' + string = ''.join([string, ' {', '"', i, '", ENABLE},\n']) + string = ''.join([string.strip(',\n'), '\n};\n']) return string def assemble_cpp_file(): @@ -109,9 +111,11 @@ def assemble_cpp_file(): + function_define_string \ + tail_string outpath = parse_args().output_file - f = open(outpath, 'w') - f.writelines(line) - f.close() + flags = os.O_WRONLY | os.O_CREAT + modes = stat.S_IWUSR | stat.S_IRUSR + with os.fdopen(os.open(outpath, flags, modes), 'w') as f: + f.writelines(line) + f.close() if __name__ == '__main__': assemble_cpp_file() diff --git a/interfaces/inner_api/builtin/jsi/jsi.h b/interfaces/inner_api/builtin/jsi/jsi.h index 30eed2273004b1c4a296b60754eb4a807f81c63e..a6443151eefe922fa3ee2e053c6fa01befbf65d9 100644 --- a/interfaces/inner_api/builtin/jsi/jsi.h +++ b/interfaces/inner_api/builtin/jsi/jsi.h @@ -77,7 +77,7 @@ struct JSPropertyDescriptor : public MemoryHeap { }; /** - * @brief JavaScriptInterface for adapatation to javascript engines. + * @brief JavaScriptInterface for adaptation to javascript engines. */ class JSI final : public MemoryHeap { public: diff --git a/test/ace_test_config.gni b/test/ace_test_config.gni index 2f44c794b60b73c85ac40759df25582ac1abce76..ab233a081c5e744df6c0d47cdfe0015871c11e4b 100644 --- a/test/ace_test_config.gni +++ b/test/ace_test_config.gni @@ -56,7 +56,6 @@ ace_test_includes = [ "$ace_lite_root/frameworks/src/core/router", "$ace_lite_root/frameworks/src/core/modules", "$ace_lite_root/frameworks/src/core/modules/presets", - "$ace_lite_root/frameworks/src/core/router", "$ace_lite_root/frameworks/src/core/stylemgr", "$ace_lite_root/frameworks/src/core/wrapper", "$ace_lite_root/test/moduletest/common", @@ -97,6 +96,7 @@ extra_deps = [ "//build/lite/config/component/cJSON:cjson_shared", "//commonlibrary/utils_lite/timer_task:ace_kit_timer", "//foundation/ability/ability_lite/frameworks/ability_lite:ability", + "//foundation/communication/netstack/frameworks/js/builtin:http_lite_shared", "//foundation/multimedia/camera_lite/frameworks:camera_lite", "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite", "//foundation/multimedia/media_lite/interfaces/kits/player_lite/js/builtin:audio_lite_api", @@ -114,7 +114,7 @@ all_external_includes = ace_lite_include_dirs + ace_test_includes # add specific defines for test case only here all_defines = ace_test_defines -if (enable_ohos_appexecfwk_feature_ability == true) { +if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { all_defines += [ "ABILITY_WINDOW_SUPPORT" ] all_defines += [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] } diff --git a/test/moduletest/common/base_test.h b/test/moduletest/common/base_test.h index 4dd413f45ca3572235c67a827378c6710c47765c..9be742a3a354367584e05842ef020a9fcaaa2425 100644 --- a/test/moduletest/common/base_test.h +++ b/test/moduletest/common/base_test.h @@ -42,7 +42,7 @@ class BaseTest { #endif public: BaseTest(); - virtual ~BaseTest(){} + virtual ~BaseTest() {} void SetUp(); void TearDown(); diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js index ce379cfb272ba3f2c94aed5bbad91ab54b3dd90c..e246eb5f8658545604238c8b05f9dadc4e93482a 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/canvas/indexAPIPerformance/index.js @@ -16,114 +16,13 @@ import {routePage} from "../../../common/js/general"; export default { ...routePage("pages/canvas/indexAPI/index"), - performance001Func: function () { - var myDate = new Date(); - var myTime=myDate.toLocaleTimeString(); - var canvasRef = this.$refs.canvas1; - var ctx = canvasRef.getContext("2d"); - console.log("stroke 1 time contains 100 times moveTo+lineTo begin =========" + myTime); - // 画101条线 - var i; - var x = 0; - // 红色 - ctx.strokeStyle = "#FF0000"; - ctx.lineWidth = 5; - for(i = 0; i< 100; i++) { - x = x + 10; - ctx.moveTo(10,x); - ctx.lineTo(30,x); - if(i === 99) { - ctx.stroke(); - console.log("stroke 1 time contains 100 times moveTo+lineTo end =========" + myTime); - ctx.beginPath(); - // 蓝色 - ctx.strokeStyle = "#0000FF"; - ctx.lineWidth = 3; - ctx.moveTo(10,x+10); - ctx.lineTo(30,x+10); - ctx.stroke(); - } - } - - // 画101个矩形 - console.log("stroke 1 time contains 100 times rect begin =========" + myTime); - ctx.beginPath(); - var y = 0; - for(i = 0; i< 100; i++) { - y = y + 10; - ctx.rect(40,y, 20,4); - if(i === 99) { - ctx.stroke(); - console.log("stroke 1 time contains 100 times rect end =========" + myTime); - ctx.beginPath(); - // 红色 - ctx.strokeStyle = "#FF0000"; - ctx.lineWidth = 2; - ctx.rect(40,y+10, 20,4); - ctx.stroke(); - } - } - - // 画101个圆 - console.log("stroke 1 time contains 100 times arc begin =========" + myTime); - ctx.beginPath(); - var z = 0; - for(i = 0; i< 100; i++) { - z = z + 10; - ctx.arc(80,z,5,Math.PI*2*(0/360),Math.PI*2*(90/360),false); - if(i === 99) { - ctx.stroke(); - console.log("stroke 1 time contains 100 times arc end =========" + myTime); - ctx.beginPath(); - // 蓝色 - ctx.strokeStyle = "#0000FF"; - ctx.lineWidth = 2; - ctx.arc(80,z+10,5,Math.PI*2*(0/360),Math.PI*2*(90/360),false); - ctx.stroke(); - } - } - - // 画101条线 - x = 0; - // 红色 - ctx.strokeStyle = "#FF0000"; - ctx.lineWidth = 1; - console.log("stroke 100 times contains 100 times moveTo+lineTo begin =========" + myTime); - for(i = 0; i< 100; i++) { - x = x + 10; - ctx.beginPath(); - ctx.moveTo(100,x); - ctx.lineTo(130,x); - ctx.stroke(); - } - console.log("stroke 100 times contains 100 times moveTo+lineTo end =========" + myTime); - - // 画100个矩形 - y = 0; - // 红色 - ctx.strokeStyle = "#FF0000"; - console.log("stroke 100 times contains 100 times rect begin =========" + myTime); - for(i = 0; i< 100; i++) { - y = y + 10; - ctx.beginPath(); - ctx.rect(140,y, 20,4); - ctx.stroke(); - } - console.log("stroke 100 time contains 100 times rect end =========" + myTime); - - // 画100个弧 - z = 0; - // 红色 - ctx.strokeStyle = "#FF0000"; - ctx.lineWidth = 1; - console.log("stroke 100 times contains 100 times arc begin =========" + myTime); - for(i = 0; i< 100; i++) { - z = z + 10; - ctx.beginPath(); - ctx.arc(170,z,5,Math.PI*2*(0/360),Math.PI*2*(140/360),false); - ctx.stroke(); - } - console.log("stroke 100 times contains 100 times arc end =========" + myTime); + performance001Func: function() { + drawLinesWithSingleStrokeAndOneSeparate.call(this); + drawRectanglesWithSingleStrokeAndOneSeparate.call(this); + drawArcsWithSingleStrokeAndOneSeparate.call(this); + drawLinesWithMultipleStrokes.call(this); + drawRectanglesWithMultipleStrokes.call(this); + drawArcsWithMultipleStrokes.call(this); }, performance002Func: function() { var myDate = new Date(); @@ -154,7 +53,6 @@ export default { ctx.stroke(); } console.log("stroke 10 time contains 10 times rect end =========" + myTime); - // 画10个弧 // 红色 ctx.strokeStyle = "#FF0000"; @@ -167,4 +65,130 @@ export default { } console.log("stroke 10 times contains 10 times arc end =========" + myTime); } +} + +function drawLinesWithSingleStrokeAndOneSeparate() { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + var myTime = new Date().toLocaleTimeString(); + var x = 0; + + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 5; + ctx.beginPath(); + for (var i = 0; i < 100; i++) { + x += 10; + ctx.moveTo(10, x); + ctx.lineTo(30, x); + } + ctx.stroke(); + console.log("stroke 1 time contains 100 times moveTo+lineTo end =========" + myTime); + + ctx.beginPath(); + ctx.strokeStyle = "#0000FF"; + ctx.lineWidth = 3; + ctx.moveTo(10, x + 10); + ctx.lineTo(30, x + 10); + ctx.stroke(); +} + +function drawRectanglesWithSingleStrokeAndOneSeparate() { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + var myTime = new Date().toLocaleTimeString(); + var y = 0; + + ctx.beginPath(); + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 2; + for (var i = 0; i < 100; i++) { + y += 10; + ctx.rect(40, y, 20, 4); + } + ctx.stroke(); + console.log("stroke 1 time contains 100 times rect end =========" + myTime); + + ctx.beginPath(); + ctx.strokeStyle = "#0000FF"; + ctx.lineWidth = 2; + ctx.rect(40, y + 10, 20, 4); + ctx.stroke(); +} + +function drawArcsWithSingleStrokeAndOneSeparate() { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + var myTime = new Date().toLocaleTimeString(); + var z = 0; + + ctx.beginPath(); + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 2; + for (var i = 0; i < 100; i++) { + z += 10; + ctx.arc(80, z, 5, Math.PI * 2 * (0 / 360), Math.PI * 2 * (90 / 360), false); + } + ctx.stroke(); + console.log("stroke 1 time contains 100 times arc end =========" + myTime); + + ctx.beginPath(); + ctx.strokeStyle = "#0000FF"; + ctx.lineWidth = 2; + ctx.arc(80, z + 10, 5, Math.PI * 2 * (0 / 360), Math.PI * 2 * (90 / 360), false); + ctx.stroke(); +} + +function drawLinesWithMultipleStrokes() { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + var myTime = new Date().toLocaleTimeString(); + var x = 0; + + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 100 times contains 100 times moveTo+lineTo begin =========" + myTime); + for (var i = 0; i < 100; i++) { + x += 10; + ctx.beginPath(); + ctx.moveTo(100, x); + ctx.lineTo(130, x); + ctx.stroke(); + } + console.log("stroke 100 times contains 100 times moveTo+lineTo end =========" + myTime); +} + +function drawRectanglesWithMultipleStrokes() { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + var myTime = new Date().toLocaleTimeString(); + var y = 0; + + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 100 times contains 100 times rect begin =========" + myTime); + for (var i = 0; i < 100; i++) { + y += 10; + ctx.beginPath(); + ctx.rect(140, y, 20, 4); + ctx.stroke(); + } + console.log("stroke 100 times contains 100 times rect end =========" + myTime); +} + +function drawArcsWithMultipleStrokes() { + var canvasRef = this.$refs.canvas1; + var ctx = canvasRef.getContext("2d"); + var myTime = new Date().toLocaleTimeString(); + var z = 0; + + ctx.strokeStyle = "#FF0000"; + ctx.lineWidth = 1; + console.log("stroke 100 times contains 100 times arc begin =========" + myTime); + for (var i = 0; i < 100; i++) { + z += 10; + ctx.beginPath(); + ctx.arc(170, z, 5, Math.PI * 2 * (0 / 360), Math.PI * 2 * (140 / 360), false); + ctx.stroke(); + } + console.log("stroke 100 times contains 100 times arc end =========" + myTime); } \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml index c838030caa2734bedad9bd0ec6d1327af5fcaacf..a9818a505b51dd36c22b5f35b15e8e5253929360 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.hml @@ -23,7 +23,7 @@ limitations under the License. - {{show}} + {{value}}
diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js index a40291e14d161323856056ad0fb21fa8778bf101..856344a4c0ad843695730045b4c98bde892c33c0 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxB025/index.js @@ -16,7 +16,7 @@ import {goPage} from "../../../common/js/general"; export default { data:{ checked:true, - show:"show" + value:"show" }, changeEvent:function(e) { if(e.checked) { diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml index cb6eada57d2581ef400cee73f97d443835e3f5b8..a12c9fffd0f6a67a73892e4989a8c1c0dc8eb775 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.hml @@ -22,7 +22,7 @@ limitations under the License. checked="{{checked}}" /> - {{show}} + {{value}}
diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js index a4ddd1992b8ad6135e585e334c40e305ef9c495f..9697bd069c25a787c1fa4b6f01116b0a797cc904 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/CheckboxE027/index.js @@ -16,7 +16,7 @@ import {goPage} from "../../../common/js/general"; export default { data:{ checked:true, - show:"show" + value:"show" }, changeEvent:function(e){ this.checked = !this.checked; diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml index 141c1b3ca9f68fe2efe6a5afe0ac9130fbf90899..26a54ee16890448a6f91caabbf79d2cb680e0c1d 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.hml @@ -29,7 +29,7 @@ limitations under the License. class="button" /> - {{show}} + {{value}}
diff --git a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js index 0411ca1f993856f0dde0c63e3af39d1c6b8036ca..f940f021e527be482ade501995c954a5cb8c5a08 100644 --- a/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js +++ b/test/moduletest/common/test_app/ui_auto_test/src/main/js/default/pages/input/InputEventTest024/index.js @@ -15,7 +15,7 @@ import {goPage} from "../../../common/js/general"; export default { data:{ - show:"show" + value:"show" }, clickOneArg:function() { this.show = "clickOne"; diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.css b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.css new file mode 100644 index 0000000000000000000000000000000000000000..d5605eca82a9faba301b945d627c47291976885d --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.css @@ -0,0 +1,182 @@ +/* + * Copyright (c) 2024 Huawei Device 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} + +.text_style_a { + width: 400px; + height: 160px; + top:100px; + left: 0px; +} + +.text_style_b { + width: 220px; + height: 60px; + top: 350px; + left: 100px; +} + +.text_sytle_c { + left: 0px; + top: 0px; + width: 400px; + height: 40px; +} + +.text_sytle_d { + left: 0px; + top: 80px; + width: 400px; + height: 60px; +} + +.text_sytle_e { + left: 0px; + top: 160px; + width: 400px; + height: 60px; +} + +.text_sytle_f { + left: 0px; + top: 240px; + width: 400px; + height: 60px; +} + +.text_sytle_g { + left: 100px; + top: 350px; + width: 220px; + height: 60px; +} + +.text_sytle_h { + left: 50px; + top: 100px; + width: 400px; + height: 60px; +} + +.swiper_size { + width: 450px; + height: 450px; + left: 0px; + top: 30px; +} + +.stack_size { + width: 400px; + height: 300px; + left: 0px; + top: 0px; +} + +.letter_spacing { + letter-spacing: 5px; +} + +.font_style { + font-size: 40px; + font-style: italic; + line-height: 40px; + text-align: center; +} + +.font_style_bottom { + font-size: 30px; + font-style: italic; + line-height: 30px; + text-align: center; +} + +.font_stye_mid { + font-size: 25px; + font-style: italic; + line-height: 25px; + text-align: left; +} + +.first_progress_size { + left: 0px; + top: 40px; + width: 400px; + height: 40px; +} + +.second_progress_size { + left: 0px; + top: 120px; + width: 400px; + height: 40px; +} + +.third_progress_size { + left: 0px; + top: 200px; + width: 400px; + height: 60px; +} + +.fourth_progress_size { + left: 0px; + top: 280px; + width: 400px; + height: 60px; +} + +.progress_style { + color:blue; + background-color:red; + width: 300px; + height: 10px; +} + +.text_decoration_style { + text-decoration: underline; + text-decoration-color: blue; + text-overflow: ellipsis; + text-color: red; +} + +@media screen and (orientation: landscape) { + .title { + font-size: 60px; + } +} + +@media screen and (device-type: tablet) and (orientation: landscape) { + .title { + font-size: 100px; + } +} \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.hml new file mode 100644 index 0000000000000000000000000000000000000000..d2740b57fa54b01517bdf3b6f17ca31a3cb21d87 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.hml @@ -0,0 +1,100 @@ + + + + + + + {{text_a}} + + + 第{{index}}页，共3页 + + + + + 第一项 {{first_text}}次 + + + + + 第二项 {{ second_text }}次 + + + + + 第三项 {{ third_text }}次 + + + + + + 第四项 {{ fourth_text }}次 + + + + + 第{{index}}页，共3页 + + + + + {{text_b}} + + + 第{{index}}页，共3页 + + + + \ No newline at end of file diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.js new file mode 100644 index 0000000000000000000000000000000000000000..c12964fba3c27b194c3ee5b7c6fcb99721c55836 --- /dev/null +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/swiper/SwiperA13/index.js @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2024 Huawei Device 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. + */ + +export default { + data: { + index: 0, + title: "", + text_a: "暂无数据", + text_b: "更多详情", + }, + onInit() { + this.title = this.$t('strings.world'); + this.first_text = 5; + this.first_percent = this.first_text; + this.second_text = 15; + this.second_percent = this.second_text; + this.third_text = 30; + this.third_percent = this.third_text; + this.fourth_text = 55; + this.fourth_percent = this.fourth_text; + }, + updateIndex(e) { + console.log("e.index = " + e.direction + " this.index=" + this.index); + if (this.index < 3 || this.index >= 0) { + if (e.direction == "up") { + this.index++; + } else { + this.index--; + } + } else { + this.index = 0; + } + } +} + + + diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml index 06b3a0fab46d4a63b4740a0c058141406e01a6ed..a31662b46b8f59cf3e522492765bd3709622a844 100644 --- a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.hml @@ -15,7 +15,7 @@ limitations under the License.
- {{show}} + {{value}}
diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js index d0881eb6e744042f281bb16a1b4e7f319f15d9ae..a2f2811ed11b5265634389c304ead8dae837ae2e 100644 --- a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setInterval02/index.js @@ -16,16 +16,17 @@ import {backPage,routePage} from "../../../common/js/general"; var index = 0; export default { - data:{show:"show", + data:{ + value: "show", index:0}, startTimer:function() { var id = setInterval(()=> { if(index >5) { - this.show = "clearInterval"; + this.value = "clearInterval"; clearInterval(id); } index ++; - this.show = index; + this.index = index; }, 200); }, goPrevious:routePage("/pages/timer/setTimeout01/index").changePage, diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml index 671b2bf7886f5471c4c5deecc2232cf6b692d462..2c7ad26c5aa2841aeeb6b29d42c47728c446f889 100644 --- a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.hml @@ -15,7 +15,7 @@ limitations under the License.
- {{show}} + {{value}}
diff --git a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js index 8227369cf83412c279893e2e36a1185c97262806..99b5009cea9ba6591906189a1561667b5f53cd6f 100644 --- a/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js +++ b/test/moduletest/common/test_app/ui_manual_test/src/main/js/default/pages/timer/setTimeout01/index.js @@ -15,9 +15,9 @@ import {backPage,routePage} from "../../../common/js/general"; export default { - data:{show:"show"}, + data:{value:"show"}, startTimer:function() { - setTimeout(()=> {this.show = "once_timer success"}, 1000); + setTimeout(()=> {this.value = "once_timer success"}, 1000); }, goPrevious:routePage("/").changePage, goHome:routePage("/").changePage,