From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/data-card/options.jsx | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 7db4e04..3733162 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -9,6 +9,17 @@
let MenuType = ''
let menu = fromJS(window.GLOB.customMenu).toJS()
let laypage = setting && setting.laypage !== 'false'
+ let interfaces = []
+ if (subtype === 'propcard' && menu.interfaces) {
+ menu.interfaces.forEach(item => {
+ if (item.status === 'true') {
+ interfaces.push({
+ value: item.uuid,
+ label: item.name
+ })
+ }
+ })
+ }
if (menu.parentId === 'BillPrintTemp') {
MenuType = 'billPrint'
@@ -82,14 +93,25 @@
options: [
{value: 'dynamic', label: '鍔ㄦ��', priKeyType: 'static'},
{value: 'static', label: '闈欐��', priKeyType: 'static'},
+ {value: 'public', label: '鍏叡鏁版嵁婧�', priKeyType: 'static'},
],
linkFields: ['priKeyType'],
controlFields: [
{field: 'goback', values: ['dynamic']},
- {field: 'empty', values: ['dynamic']},
+ {field: 'empty', values: ['dynamic', 'public']},
{field: 'jump', values: ['dynamic']},
{field: 'supModule', values: ['static']},
+ {field: 'publicId', values: ['public']},
],
+ forbid: subtype !== 'propcard'
+ },
+ {
+ type: 'select',
+ field: 'publicId',
+ label: '鏁版嵁婧�',
+ initval: wrap.publicId || '',
+ required: true,
+ options: interfaces,
forbid: subtype !== 'propcard'
},
{
@@ -160,6 +182,9 @@
{ParentID: 'dynamic', value: 'static', label: '闈欐�佸��'},
{ParentID: 'dynamic', value: 'dynamic', label: '鍔ㄦ�佸��'},
{ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
+ {ParentID: 'public', value: 'static', label: '闈欐�佸��'},
+ {ParentID: 'public', value: 'dynamic', label: '鍔ㄦ�佸��'},
+ {ParentID: 'public', value: 'joint', label: '鎷兼帴鍊�'},
],
forbid: subtype !== 'propcard'
},
--
Gitblit v1.8.0