@titaui/pc 1.10.79 → 1.10.80

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/components/menus/export-modules/okr-menus/subordinate-menus/index.js +13 -10
  2. package/package.json +2 -1
package/lib/components/menus/export-modules/okr-menus/subordinate-menus/index.js CHANGED
@@ -112,14 +112,15 @@ function _default(props) {
112
112
  });
113
113
  };
114
114
 
115
- var filterData = function filterData(childNode, grandNode) {
115
+ var filterData = function filterData(newNode, oldNode) {
116
116
  var mark = {};
117
- childNode.forEach(function (item) {
118
- mark[item.id] = true;
117
+ newNode.forEach(function (item) {
118
+ mark[item.userId] = true;
119
119
  });
120
- return grandNode.filter(function (item) {
121
- !mark[item.userId];
120
+ var newArry = oldNode.filter(function (item) {
121
+ return !mark[item.id];
122
122
  });
123
+ return newArry;
123
124
  };
124
125
 
125
126
  var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -130,16 +131,18 @@ function _default(props) {
130
131
  promise.then(function (nodes) {
131
132
  var _treeNode$children;
132
133
 
134
+ if (!nodes.length) return null;
135
+ var oldRawTreeData = rawTreeData;
136
+
133
137
  if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
134
- nodes = filterData(treeNode.children, nodes);
138
+ oldRawTreeData = filterData(nodes, oldRawTreeData);
135
139
  }
136
140
 
137
- if (!nodes.length) return null;
138
141
  (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
139
- return rawTreeData.push(it);
142
+ return oldRawTreeData.push(it);
140
143
  });
141
- setRawTreeData(rawTreeData);
142
- setTreeData((0, _utils.toTree)(rawTreeData));
144
+ setRawTreeData(oldRawTreeData);
145
+ setTreeData((0, _utils.toTree)(oldRawTreeData));
143
146
  return true;
144
147
  });
145
148
  resolve(true);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.10.79",
3
+ "version": "1.10.80",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -77,6 +77,7 @@
77
77
  "@titaui/rc-tree2": "4.1.23",
78
78
  "@titaui/rc-trigger": "5.2.5",
79
79
  "@titaui/react-flow-renderer": "9.5.4",
80
+ "@titaui/request": "^1.0.1",
80
81
  "@titaui/toast": "1.0.0",
81
82
  "@types/color": "3.0.3",
82
83
  "@types/prosemirror-commands": "1.0.4",