From 4cc738e535d1a20701d206e12cf9de8cc5a01170 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:24:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/balcony/options.jsx | 54 ++++++++++++++++++++++--------------------------------
1 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/src/menu/components/card/balcony/options.jsx b/src/menu/components/card/balcony/options.jsx
index c73bf93..3361862 100644
--- a/src/menu/components/card/balcony/options.jsx
+++ b/src/menu/components/card/balcony/options.jsx
@@ -1,5 +1,5 @@
import React from 'react'
-import MenuUtils from '@/utils/utils-custom.js'
+import MenuUtils, { getLinkModules, getInterfaces } from '@/utils/utils-custom.js'
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
@@ -9,22 +9,12 @@
let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
let ispop = sessionStorage.getItem('editMenuType') === 'popview'
- let modules = MenuUtils.getLinkModules(menu.components) || []
+ let modules = getLinkModules(menu.components) || []
let supmodules = MenuUtils.getSupModules(menu.components, '', menu.interfaces)
let roleList = sessionStorage.getItem('sysRoles')
let appType = sessionStorage.getItem('appType')
- let interfaces = []
- if (menu.interfaces) {
- menu.interfaces.forEach(item => {
- if (item.status === 'true') {
- interfaces.push({
- value: item.uuid,
- label: item.name
- })
- }
- })
- }
+ let interfaces = getInterfaces()
if (roleList) {
try {
@@ -61,7 +51,7 @@
field: 'datatype',
label: '鏁版嵁鏉ユ簮',
initval: wrap.datatype || 'static',
- tooltip: '閫夋嫨闈欐�佸�硷紝鏃犻渶閰嶇疆鏁版嵁婧愩��',
+ tooltip: '閫夋嫨闈欐�佹椂锛屾棤闇�閰嶇疆鏁版嵁婧愶紝鍙睍绀轰笂绾х粍浠舵垨url鍙傛暟瀛楁銆�',
required: false,
options: [
{value: 'dynamic', label: '鍔ㄦ��'},
@@ -82,23 +72,15 @@
required: true,
options: interfaces,
reset_source: true,
- callback: (map, record) => {
+ callback: (record) => {
if (!record.publicId) return
- let interfaces = window.GLOB.customMenu.interfaces || []
-
- let d = interfaces.filter(m => m.uuid === record.publicId && m.status === 'true')[0]
+ let d = interfaces.filter(m => m.value === record.publicId)[0]
if (!d || !d.columns) return
- let columns = JSON.parse(JSON.stringify(d.columns))
-
- let _bgField = map.get('bgField')
-
- if (_bgField && !_bgField.forbid) {
- _bgField.options = columns
- _bgField.oriOptions = columns
- map.set('bgField', _bgField)
+ return {
+ bgField: d.columns
}
}
},
@@ -108,15 +90,13 @@
label: '鍙楁帶绫诲瀷',
initval: wrap.linkType || 'static',
tooltip: <div>
- <div>缁勪欢涓庡叾浠栫粍浠朵箣闂寸殑鎺у埗绫诲瀷: </div>
- <div>1銆佺嫭绔嬭〃绀轰笌鍏朵粬缁勪欢娌℃湁鍏宠仈銆�</div>
- <div>2銆佸悓姝ョ被鍨嬩腑鍏紡銆佹寜閽互鍙婂叏閫夊厓绱犳瘮杈冪壒娈婏紝鎿嶄綔鏁版嵁涓哄叾鍚屾缁勪欢鐨勬暟鎹��</div>
- <div>3銆佷笂绾х被鍨嬮渶娣诲姞褰撳墠缁勪欢鐨勪笂绾х粍浠讹紝骞跺彲璁剧疆褰撳墠缁勪欢涓哄缁堟樉绀猴紝杩樻槸鍙湁鍦ㄤ笂绾х粍浠堕�夎鍚庢墠鏄剧ず銆�</div>
+ <div>鍚屾绫诲瀷锛氭绫诲瀷鏃跺叕寮忋�佹寜閽互鍙婂叏閫夊厓绱犳瘮杈冪壒娈婏紝鎿嶄綔鏁版嵁涓哄叾鍚屾缁勪欢閫変腑鐨勬暟鎹��</div>
+ <div>涓婄骇绫诲瀷锛氬彲璁剧疆褰撳墠缁勪欢鐨勬樉绀烘潯浠讹紙濮嬬粓鏄剧ず鎴栦笂绾ч�夎鏃舵樉绀猴級锛屼笌闈欐�佹暟鎹簮閰嶅悎涔熷彲鐢ㄤ簬灞曠ず涓婄骇缁勪欢閫変腑鐨勪俊鎭��</div>
</div>,
toolWidth: 400,
required: false,
options: [
- {value: 'static', label: '鐙珛'},
+ {value: 'static', label: '鏃�'},
{value: 'sync', label: '鍚屾'},
{value: 'sup', label: '涓婄骇'},
],
@@ -133,7 +113,6 @@
field: 'supModule',
label: '涓婄骇缁勪欢',
initval: wrap.supModule || [],
- // tooltip: '褰撲笂绾х粍浠朵笉瀛樺湪鎴栨病鏈夋潈闄愭椂锛屽綋鍓嶇粍浠朵笉鏄剧ず銆�',
required: true,
options: supmodules,
forbid: isprint
@@ -149,6 +128,16 @@
{value: 'hidden', label: '閫夎'},
{value: 'show', label: '濮嬬粓'},
],
+ forbid: isprint
+ },
+ {
+ type: 'cascader',
+ field: 'syncModule',
+ label: '鍚屾缁勪欢',
+ initval: wrap.syncModule || '',
+ tooltip: '褰撳悓姝ョ粍浠朵笉瀛樺湪鎴栨病鏈夋潈闄愭椂锛屽綋鍓嶇粍浠朵笉鏄剧ず銆�',
+ required: true,
+ options: modules,
forbid: isprint
},
{
@@ -193,6 +182,7 @@
label: '鑳屾櫙鍥�',
initval: wrap.bgField || '',
tooltip: '鍔ㄦ�佽儗鏅紝鑳屾櫙鍥剧墖鐢卞瓧娈靛�兼帶鍒躲�傝娉ㄦ剰璋冩暣鑳屾櫙鏍峰紡銆�',
+ timestamp: new Date().getTime(),
required: false,
options: columns
},
--
Gitblit v1.8.0