From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/formconfig.jsx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 4065d94..ecbc867 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -67,6 +67,7 @@
key: 'sysInterface',
label: '绯荤粺鎺ュ彛',
initVal: setting.sysInterface || 'false',
+ tooltip: '鍗曠偣鐧诲綍绯荤粺',
required: false,
readonly: false,
options: [
@@ -1118,6 +1119,7 @@
key: 'sysInterface',
label: '绯荤粺鎺ュ彛',
initVal: card.sysInterface || 'false',
+ tooltip: '鍗曠偣鐧诲綍绯荤粺',
required: true,
options: [{
value: 'true',
@@ -2379,7 +2381,7 @@
* @param {*} linkableFields // 鍙叧鑱旇〃鍗�
* @param {*} linksupFields // 涓婄骇琛ㄥ崟
*/
-export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields) {
+export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields, columns = []) {
let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
if (roleList) {
@@ -2578,7 +2580,8 @@
label: '瀛楁',
initVal: card.field || '',
required: true,
- readonly: false
+ readonly: false,
+ options: columns
},
{
type: 'select',
--
Gitblit v1.8.0