Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into de...

king

2023-06-22 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee

 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
        }