@zgfe/modules-dm 1.0.57-zhongyuan.21 → 1.0.57-zhongyuan.22

package/es/modules/dataManage/components/tablePlus.d.ts

@@ -18,8 +18,8 @@ interface DataType {
     owner: string;
     triggeringOccasion: string;
     canDel: boolean;
-    businessLabelId: string;
-    triggerLabelId: string;
+    businessLabelId: number;
+    triggerLabelId: number;
     triggerLabel: labelData;
     businessLabel: labelData;
 }

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

@@ -600,8 +600,8 @@ var TablePlus = function TablePlus(props) {
   //标签列表数据 2:业务标签 3:触发标签
   var _useState41 = useState(),
     _useState42 = _slicedToArray(_useState41, 2),
-    eventId = _useState42[0],
-    setEventId = _useState42[1];
+    eventData = _useState42[0],
+    setEventData = _useState42[1];
   var _useState43 = useState([]),
     _useState44 = _slicedToArray(_useState43, 2),
     bizTag = _useState44[0],
@@ -662,7 +662,7 @@ var TablePlus = function TablePlus(props) {
       method: 'post',
       data: _objectSpread({
         appId: getAppID(currentApp),
-        eventId: eventId
+        eventId: eventData === null || eventData === void 0 ? void 0 : eventData.event_id
       }, params)
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.data) === 0) {
@@ -676,6 +676,26 @@ var TablePlus = function TablePlus(props) {
       fn();
     });
   };
+  //解除绑定标签
+  var delLabelRelation = function delLabelRelation(id, type) {
+    request(apis.dict.delLabelRelation, {
+      method: 'post',
+      data: {
+        appId: getAppID(currentApp),
+        eventId: eventData === null || eventData === void 0 ? void 0 : eventData.event_id,
+        labelType: type,
+        id: id
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.data) === 0) {
+        message.error(res.msg);
+      } else {
+        message.success('修改成功');
+        props.Refresh();
+        state.updateEventMetas && state.updateEventMetas(); // 更新store
+      }
+    });
+  };
   var columns = [{
     title: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       style: {
@@ -811,7 +831,7 @@ var TablePlus = function TablePlus(props) {
           getTagList(2);
           setBizTagId(record.businessLabelId);
           setBizTagShow(true);
-          setEventId(record.event_id);
+          setEventData(record);
         },
         type: "zhongmingming"
       }));
@@ -1315,11 +1335,15 @@ var TablePlus = function TablePlus(props) {
     okText: "\u786E\u5B9A",
     open: bizTagShow,
     onOk: function onOk() {
-      updateEvent({
-        businessLabelId: bizTagId
-      }, function () {
-        setBizTagShow(false);
-      });
+      if (bizTagId) {
+        updateEvent({
+          businessLabelId: bizTagId
+        }, function () {
+          setBizTagShow(false);
+        });
+      } else {
+        delLabelRelation(eventData === null || eventData === void 0 ? void 0 : eventData.businessLabelId, 2);
+      }
     },
     onCancel: function onCancel() {
       setBizTagShow(false);
@@ -1405,12 +1429,16 @@ var TablePlus = function TablePlus(props) {
     okText: "\u786E\u5B9A",
     open: triggeringShow,
     onOk: function onOk() {
-      updateEvent({
-        triggeringOccasion: triggeringInput,
-        triggerLabelId: triTagId
-      }, function () {
-        setTriggeringShow(false);
-      });
+      if (triTagId) {
+        updateEvent({
+          triggeringOccasion: triggeringInput,
+          triggerLabelId: triTagId
+        }, function () {
+          setTriggeringShow(false);
+        });
+      } else {
+        delLabelRelation(eventData === null || eventData === void 0 ? void 0 : eventData.triggerLabelId, 3);
+      }
     },
     onCancel: function onCancel() {
       setTriggeringInput('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.21",
+  "version": "1.0.57-zhongyuan.22",
   "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": "56c5481dfd276b587d3d9c9c43d95e9306b42186",
+  "gitHead": "c77c90c4f63fe9b8fd1a57a6faf8c9bdb25d0a21",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }