From 403e1d56c8fa43d5ab9f6f96b159003144e4000d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:18:18 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/modalform/index.jsx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index a860265..de7bc87 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -41,7 +41,7 @@
hint: ['label', 'field', 'type', 'blacklist', 'supField', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
split: ['label', 'type', 'marginTop', 'marginBottom', 'splitline', 'splitctrl', 'supField', 'opacity'],
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', 'contHeidht'],
+ brafteditor: ['required', 'hidelabel', 'hidden', 'readin', 'fieldlength', 'readonly', 'span', 'labelwidth', 'tooltip', 'interception', 'extra', 'encryption', 'marginTop', 'marginBottom', 'contHeidht'],
funcvar: ['span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
linkMain: ['readonly', 'required', 'hidden','declare', 'span', 'labelwidth', 'tooltip', 'interception', 'extra', 'place', 'marginTop', 'marginBottom', 'verifyVal'],
popSelect: ['initval', 'readonly', 'required', 'hidden', 'readin', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'place', 'enter', 'dataSource', 'columns', 'primaryKey', 'order', 'controlField', 'laypage', 'onload', 'searchKey', 'showField', 'popWidth'],
@@ -295,6 +295,10 @@
if (this.record.interception === 'func') {
shows.push('func')
}
+ } else if (type === 'brafteditor') {
+ if (this.record.interception === 'func') {
+ shows.push('func')
+ }
} else if (type === 'popSelect') {
if (this.record.enter === 'tab' || this.record.enter === 'sub') {
shows.push('tabField')
@@ -421,7 +425,9 @@
if (value === 'brafteditor') {
this.record.encryption = 'true'
+ this.record.interception = 'false'
_fieldval.encryption = 'true'
+ _fieldval.interception = 'false'
}
if (value === 'linkMain') {
--
Gitblit v1.8.0