From 481486403417e37a2667dc341cd7e7bc43d1e86e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十二月 2023 13:03:11 +0800
Subject: [PATCH] 2023-12-15
---
src/tabviews/rolemanage/index.jsx | 45 +++++++++++++++++++++++++++------------------
src/views/basedesign/updateFormTab/index.jsx | 4 ++--
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 2 ++
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 2 ++
4 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index 63aa365..f397ce4 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -356,7 +356,7 @@
/**
* @description 鑾峰彇鏉冮檺鍒嗛厤鏍�
*/
- getTree = (parents, options) => {
+ getTree = (parents, options, addSelf) => {
parents.forEach(parent => {
parent.children = []
@@ -367,7 +367,7 @@
title: option.MenuName,
key: option.MenuID,
addSelf: option.OnlySelf === 'true',
- tabs: option.Tabs
+ // tabs: option.Tabs
})
}
})
@@ -375,13 +375,13 @@
if (parent.children.length === 0) {
parent.children = null
// 閽堝鏍囩锛岀敓鎴愭柊鐨刬d锛屽苟淇濆瓨鍏宠仈鍏崇郴锛堟爣绛句笉鍞竴锛�
- if (parent.tabs) {
- let _uuid = Utils.getuuid()
- linkMap.set(_uuid, parent.key)
+ // if (parent.tabs) {
+ // let _uuid = Utils.getuuid()
+ // linkMap.set(_uuid, parent.key)
- parent.originKey = parent.key
- parent.key = _uuid
- }
+ // parent.originKey = parent.key
+ // parent.key = _uuid
+ // }
} else {
// 涓夌骇鑿滃崟鍒涘缓瀛愰」
if (parent.addSelf) {
@@ -392,20 +392,29 @@
parent.children.unshift({
title: parent.title + '(浠呴〉闈�)',
key: _uuid,
- isSubView: true
+ // isSubView: true
+ })
+ } else if (addSelf) {
+ let _uuid = Utils.getuuid()
+ linkMap.set(_uuid, parent.key)
+ parent.subKey = _uuid
+
+ parent.children.unshift({
+ title: parent.title + '(琛ㄦ牸)',
+ key: _uuid,
})
}
// 閽堝鏍囩锛岀敓鎴愭柊鐨刬d锛屽苟淇濆瓨鍏宠仈鍏崇郴锛堟爣绛句笉鍞竴锛�
- if (parent.tabs) {
- let _uuid = Utils.getuuid()
- linkMap.set(_uuid, parent.key)
+ // if (parent.tabs) {
+ // let _uuid = Utils.getuuid()
+ // linkMap.set(_uuid, parent.key)
- parent.originKey = parent.key
- parent.key = _uuid
- }
+ // parent.originKey = parent.key
+ // parent.key = _uuid
+ // }
- parent.children = this.getTree(parent.children, options)
+ parent.children = this.getTree(parent.children, options, parent.addSelf)
}
})
return parents
@@ -442,8 +451,8 @@
}
}
return true
- } else if (parent.isSubView) {
- return true
+ // } else if (parent.isSubView) {
+ // return true
}
return false
})
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 18de67e..7b073fc 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -447,6 +447,8 @@
confirm({
content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�',
+ okText: '鏇存柊',
+ cancelText: '涓嶆洿鏂�',
onOk() {
_columns = _columns.map(item => {
let key = item.Column.toLowerCase()
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index aac8482..2afb057 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -717,6 +717,8 @@
confirm({
content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�',
+ okText: '鏇存柊',
+ cancelText: '涓嶆洿鏂�',
onOk() {
columns = columns.map(item => {
let key = item.Column.toLowerCase()
diff --git a/src/views/basedesign/updateFormTab/index.jsx b/src/views/basedesign/updateFormTab/index.jsx
index bd06654..04821eb 100644
--- a/src/views/basedesign/updateFormTab/index.jsx
+++ b/src/views/basedesign/updateFormTab/index.jsx
@@ -915,7 +915,7 @@
let _card = {
uuid: newCon.uuid,
type: 'table',
- name: newCon.name,
+ name: newCon.name || '',
format: 'array',
pageable: true,
switchable: true,
@@ -923,7 +923,7 @@
action: [],
subtype: 'normaltable',
setting: { useMSearch: 'false', sync: 'false', onload: 'true' },
- wrap: {name: newCon.name},
+ wrap: {name: newCon.name || ''},
style: {},
headerStyle: {},
columns: [],
--
Gitblit v1.8.0