From 175ebe59e5dbe9659f6f042a0ea01193ad6006a2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 八月 2023 15:54:06 +0800
Subject: [PATCH] 2023-08-24
---
src/tabviews/custom/index.jsx | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 195ad72..c9c6a73 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -530,7 +530,6 @@
}
if (item.type === 'table') {
- let statFields = []
let getCols = (cols) => {
return cols.filter(col => {
if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
@@ -542,9 +541,6 @@
}
if (col.type === 'number') {
- if (col.sum === 'true' && !statFields.includes(col.field)) {
- statFields.push(col)
- }
if (typeof(col.decimal) === 'number') {
col.round = Math.pow(10, col.decimal)
if (col.format === 'percent') {
@@ -595,7 +591,6 @@
}
item.cols = getCols(item.cols)
- item.statFields = statFields
if (item.subtype === 'editable') {
item.submit.logLabel = item.$menuname + '-鎻愪氦'
@@ -868,6 +863,11 @@
resetElement = (cell) => {
cell.style = cell.style || {}
+
+ if (cell.style.display === 'inline-block') {
+ cell.style.verticalAlign = 'top'
+ }
+
if (['text', 'number', 'formula'].includes(cell.eleType)) {
if (!cell.height) {
cell.innerHeight = 'auto'
@@ -1018,6 +1018,10 @@
component.setting.custompage = /@pageSize@|@orderBy@/i.test(component.setting.dataresource + component.setting.customScript)
+ if (!component.setting.execute || component.setting.custompage) {
+ component.forbidLine = true
+ }
+
if (component.setting.sync === 'true') {
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
if ((!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true') {
--
Gitblit v1.8.0