From 870b6e10f9428e769530b94df3034e567a516429 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 六月 2022 00:53:58 +0800
Subject: [PATCH] 2022-06-21

---
 src/templates/zshare/modalform/index.jsx |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 0fca860..8e2e0a6 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -37,6 +37,7 @@
   rate: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'splitline', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'allowHalf', 'rateCount', 'character', 'place'],
   hint: ['label', 'field', 'type', 'blacklist', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
   split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline'],
+  formula: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', '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', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'marginTop', 'marginBottom']
@@ -119,7 +120,7 @@
 
     reRequired.field = true
 
-    if (type === 'hint' || type === 'split') {
+    if (['hint', 'split', 'formula'].includes(type)) {
       reRequired.field = false
       shows = fromJS(modalTypeOptions[type]).toJS()
     }
@@ -215,7 +216,7 @@
       reTooltip.initval = '浣跨敤$first琛ㄧず榛樿閫夋嫨绗竴椤广��'
     }
 
-    if (this.record.supField) {
+    if (this.record.supField && !['hint', 'split', 'formula'].includes(type)) {
       shows.push('supvalue')
     }
 

--
Gitblit v1.8.0