From 7067c6095571c19bbeeb04fa130afff54559aa82 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 二月 2024 15:34:53 +0800
Subject: [PATCH] 2024-02-08
---
src/tabviews/zshare/mutilform/index.jsx | 21 +++++++++++++--------
src/templates/zshare/modalform/index.jsx | 8 ++++----
src/mob/components/formdragelement/index.scss | 1 +
src/templates/modalconfig/dragelement/index.scss | 1 +
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index 2798a34..29ff2b8 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -309,6 +309,7 @@
font-weight: inherit;
padding-left: 10px;
padding-top: 10px;
+ min-height: 15px;
border-bottom: 1px solid #e9e9e9;
}
.check-card-edit-box .card-cell span {
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 8c3ca5e..fd99651 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -80,7 +80,18 @@
}
formlist = formlist.filter(item => {
+ if (item.type === 'hint') {
+ if (item.field && data[item.field.toLowerCase()]) {
+ item.message = data[item.field.toLowerCase()]
+ }
+ delete item.field
+ }
+
if (item.supField) { // 澶氬眰琛ㄥ崟鎺у埗
+ if (['hint', 'split', 'formula'].includes(item.type)) {
+ item.field = item.uuid
+ fieldMap.set(item.field, item)
+ }
let supvals = []
if (item.supvalue) {
item.supvalue.split(',').forEach(val => {
@@ -115,14 +126,8 @@
}
}
- if (item.type === 'split' || item.type === 'formula') return true
- if (item.type === 'hint') {
- if (item.field && data[item.field.toLowerCase()]) {
- item.message = data[item.field.toLowerCase()]
- }
- delete item.field
- return true
- } else if (item.type === 'date') {
+ if (['hint', 'split', 'formula'].includes(item.type)) return true
+ if (item.type === 'date') {
item.precision = item.precision || 'day'
} else if (item.type === 'datetime') {
item.type = 'date'
diff --git a/src/templates/modalconfig/dragelement/index.scss b/src/templates/modalconfig/dragelement/index.scss
index c99318b..742699b 100644
--- a/src/templates/modalconfig/dragelement/index.scss
+++ b/src/templates/modalconfig/dragelement/index.scss
@@ -26,6 +26,7 @@
color: #1890ff;
font-size: 15px;
padding-left: 10px;
+ min-height: 21px;
border-bottom: 1px solid #e9e9e9;
}
.ant-form-item.checkcard {
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 2b37e7c..82d6117 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -38,9 +38,9 @@
cascader: ['readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'splitline', 'marginTop', 'marginBottom', 'separator'],
color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'colorType', 'extra', 'marginTop', 'marginBottom'],
rate: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'splitline', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'allowHalf', 'color', 'rateCount', 'character', 'place'],
- hint: ['label', 'field', 'type', 'blacklist', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
- split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'splitctrl'],
- formula: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'span', 'labelwidth', 'formula', 'eval', 'postfix'],
+ hint: ['label', 'field', 'type', 'blacklist', 'supField', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
+ split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'splitctrl', 'supField'],
+ formula: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'supField', 'span', 'labelwidth', 'formula', 'eval', 'postfix'],
brafteditor: ['required', 'hidelabel', 'hidden', 'readin', 'fieldlength', 'readonly', 'span', 'labelwidth', 'tooltip', 'extra', 'encryption', 'marginTop', 'marginBottom'],
funcvar: ['span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
linkMain: ['readonly', 'required', 'hidden','declare', 'span', 'labelwidth', 'tooltip', 'interception', 'extra', 'place', 'marginTop', 'marginBottom'],
@@ -361,7 +361,7 @@
reTooltip.initval = '浣跨敤$first琛ㄧず榛樿閫夋嫨绗竴椤广��'
}
- if (this.record.supField && !['hint', 'split', 'formula'].includes(type)) {
+ if (this.record.supField) {
shows.push('supvalue')
}
--
Gitblit v1.8.0