From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-custom.js | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 162b4cb..a7a4398 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -872,6 +872,25 @@
}
/**
+ * @description 鑾峰彇鍥捐〃楂樺害
+ */
+export function getHeight (val) {
+ if (typeof(val) === 'string') {
+ if (val.indexOf('px') > -1) {
+ val = parseFloat(val)
+ } else if (val.indexOf('vw') > -1) {
+ val = parseFloat(val)
+ val = document.body.clientWidth * val / 100
+ } else if (val.indexOf('vh') > -1) {
+ val = parseFloat(val)
+ val = document.body.clientHeight * val / 100
+ }
+ }
+
+ return parseInt(val || 400) - 30
+}
+
+/**
* @description 鑾峰彇琛ㄥ悕
*/
export function getTables (config, pops) {
@@ -882,7 +901,7 @@
if (config.setting && (!config.wrap || !config.wrap.datatype || config.wrap.datatype === 'dynamic')) {
if (config.setting.interType === 'system') {
- if (config.setting.execute !== 'false') {
+ if (config.setting.execute !== 'false' && config.setting.dataresource) {
let tbs = config.setting.dataresource.match(cutreg)
tbs && cuts.push(...tbs)
}
--
Gitblit v1.8.0