From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/utils/utils-custom.js | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index bb79085..cf2d151 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -280,6 +280,11 @@
return cell
})
item.components = this.resetConfig(item.components)
+ } else if (item.type === 'menubar') {
+ item.subMenus = item.subMenus.map(cell => {
+ cell.uuid = this.getuuid()
+ return cell
+ })
} else if (item.type === 'card' || item.type === 'carousel' || (item.type === 'table' && item.subtype === 'tablecard')) {
item.subcards.forEach(card => {
card.uuid = this.getuuid()
@@ -373,18 +378,20 @@
* @return {Object} style
*/
export function resetStyle (style) {
- if (sessionStorage.getItem('appType') === 'mob' && style) {
+ if (!style) return {}
+ if (sessionStorage.getItem('appType') === 'mob') {
let _style = JSON.stringify(style)
+ // scaleview
_style = _style.replace(/\d+vw/ig, (word) => {
- return parseFloat(word) * 350 / 100 + 'px'
+ return parseFloat(word) * 420 / 100 + 'px'
+ // return parseFloat(word) * 350 / 100 + 'px'
}).replace(/\d+vh/ig, (word) => {
- return parseFloat(word) * 615 / 100 + 'px'
+ return parseFloat(word) * 738 / 100 + 'px'
+ // return parseFloat(word) * 615 / 100 + 'px'
})
return JSON.parse(_style)
- } else {
- return style
}
-
+ return JSON.parse(JSON.stringify(style))
}
\ No newline at end of file
--
Gitblit v1.8.0