From eb08a523751ecd7b66dfb00af14a3a8df4fea593 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 15:58:03 +0800
Subject: [PATCH] 2023-06-20
---
src/tabviews/custom/components/tree/antd-tree/index.jsx | 4 +++-
src/tabviews/custom/components/tabs/antv-tabs/index.jsx | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/tabs/antv-tabs/index.jsx b/src/tabviews/custom/components/tabs/antv-tabs/index.jsx
index 69b47b4..6d8b799 100644
--- a/src/tabviews/custom/components/tabs/antv-tabs/index.jsx
+++ b/src/tabviews/custom/components/tabs/antv-tabs/index.jsx
@@ -36,7 +36,7 @@
let val = ''
Object.keys(data).forEach(key => {
if (key.toLowerCase() === _tabs.setting.controlField) {
- val = data[key]
+ val = data[key] + ''
}
})
_tabs.subtabs = config.subtabs.filter(tab => {
@@ -96,7 +96,7 @@
let val = ''
Object.keys(data).forEach(key => {
if (key.toLowerCase() === tabs.setting.controlField) {
- val = data[key]
+ val = data[key] + ''
}
})
this.setState({
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 922eba9..2d63a92 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -339,6 +339,7 @@
if (pval === config.wrap.mark) {
parentNodes.push({
...item,
+ mk_floor: 1,
$$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
@@ -355,7 +356,7 @@
}
})
let _treedata = this.getTree(parentNodes, _options)
-
+
let _treeNodes = []
if (!searchkey) {
@@ -437,6 +438,7 @@
// 娣诲姞鑿滃崟鐨勫瓙鍏冪礌
options = options.filter(option => {
if (option.$parentId === parent.$key) {
+ option.mk_floor = parent.mk_floor + 1
parent.children.push(option)
return false
}
--
Gitblit v1.8.0