@zgfe/modules-dm 1.0.57-zhongyuan.63 → 1.0.57-zhongyuan.65

package/es/modules/clearRule/addRule.js

@@ -472,14 +472,14 @@ var AddRule = function AddRule(_ref) {
       viewDisabled: ruleRowView,
       id: o.uniqueId,
       editStatus: currentRuleDetail ? true : false
-    }), /*#__PURE__*/React.createElement("div", {
+    }), !ruleRowView && (/*#__PURE__*/React.createElement("div", {
       style: {
         cursor: 'pointer'
       },
       onClick: function onClick() {
         return handleRuleDel(o.uniqueId);
       }
-    }, "X"));
+    }, "X")));
   }))), /*#__PURE__*/React.createElement(Space, null, !ruleRowView && options.map(function (item, index) {
     return /*#__PURE__*/React.createElement(Button, {
       key: index,

package/es/modules/dataManage/collectionAttributeList.js

@@ -136,10 +136,11 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     if (source == 'user') {
       queryUserPropMeta();
     } else {
+      var ownerEventName = (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name) || '';
       var _temp = eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (item) {
         item.name = item.attr_name;
         item.type = item.prop_type;
-        if (ownerWhiteListDataList.includes(item === null || item === void 0 ? void 0 : item.attr_name)) {
+        if (eventWhiteList.includes(ownerEventName) && ownerWhiteListDataList.includes(item === null || item === void 0 ? void 0 : item.attr_name)) {
           return _objectSpread(_objectSpread({}, item), {}, {
             newOwner: 'zg_abp'
           });

package/es/modules/dataManage/collectionEventList.js

@@ -585,18 +585,22 @@ var CollectionEventList = function CollectionEventList(props) {
             notification.success({
               message: '生成测试报告成功！'
             });
+            // 清空需求id
+            formReport.setFieldsValue({
+              demandId: ''
+            });
             setIsTextReport(false);
-            _context.next = 12;
+            _context.next = 13;
             break;
-          case 9:
-            _context.prev = 9;
+          case 10:
+            _context.prev = 10;
             _context.t0 = _context["catch"](0);
             console.log(_context.t0, '测试报告验证失败');
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 9]]);
+      }, _callee, null, [[0, 10]]);
     }));
     return function submitReport() {
       return _ref.apply(this, arguments);
@@ -629,17 +633,21 @@ var CollectionEventList = function CollectionEventList(props) {
               message: '生成数据包成功！'
             });
             setIsExportData(false);
-            _context2.next = 12;
+            // 清空需求id
+            formExport.setFieldsValue({
+              demandId: ''
+            });
+            _context2.next = 13;
             break;
-          case 9:
-            _context2.prev = 9;
+          case 10:
+            _context2.prev = 10;
             _context2.t0 = _context2["catch"](0);
             console.log(_context2.t0, '测试数据包失败');
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 9]]);
+      }, _callee2, null, [[0, 10]]);
     }));
     return function submitExport() {
       return _ref2.apply(this, arguments);

package/es/modules/dataManage/components/tablePlus.js

@@ -793,7 +793,7 @@ var TablePlus = function TablePlus(props) {
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement("div", {
         className: "alias_name"
-      }, ' ', record.businessLabel ? /*#__PURE__*/React.createElement(Tag, {
+      }, record.businessLabel ? /*#__PURE__*/React.createElement(Tag, {
         color: "blue"
       }, record.businessLabel.labelName) : '', /*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
@@ -1025,7 +1025,7 @@ var TablePlus = function TablePlus(props) {
           setPanelShow(true);
           setCurrentRow(record);
         }
-      }, ' ', panelCount || 0, ' ');
+      }, panelCount || 0);
     }
   }, {
     title: '创建时间',
@@ -1051,7 +1051,7 @@ var TablePlus = function TablePlus(props) {
         ellipsis: {
           tooltip: text
         }
-      }, text), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
+      }, text), record.groupId === undefined && (/*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
           if (!authority[1000003]) {
@@ -1293,6 +1293,7 @@ var TablePlus = function TablePlus(props) {
           state.updateEventMetas && state.updateEventMetas(); // 更新store
         });
       }
+      setBizTagShow(false);
     },
     onCancel: function onCancel() {
       setBizTagShow(false);

package/es/modules/dataMap/component/leftTree.js

@@ -241,7 +241,6 @@ var LeftTree = function LeftTree(props) {
     }),
     autoExpandParent: true,
     selectedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
-    expandedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
     defaultExpandedKeys: [(currentTree === null || currentTree === void 0 ? void 0 : currentTree.key) || ''],
     onSelect: onSelect,
     fieldNames: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.63",
+  "version": "1.0.57-zhongyuan.65",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "297b7c0c17acb4f4c56c9c3030fee1ff8610426e",
+  "gitHead": "dd0f9305428fbb1d2391e1ed4ca733ef420e5853",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }