@zgfe/modules-dm 1.0.57-zhongyuan.30 → 1.0.57-zhongyuan.32

package/es/modules/clearRule/addRule.js

@@ -610,13 +610,11 @@ var TypeComponent = function TypeComponent(_ref2) {
       });
       break;
     case 6:
-      Component = /*#__PURE__*/React.createElement(Select
-      //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
-      , {
-        //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
-        value: optionsValue.filter(function (r) {
+      Component = /*#__PURE__*/React.createElement(Select, {
+        defaultValue: Number(optionsValue.filter(function (r) {
           return r.ruleType == type;
-        })[0].content,
+        })[0].content),
+        // value={optionsValue.filter((r) => r.ruleType == type)[0].content}
         placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
         options: dictList,
         onChange: function onChange(value) {

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

@@ -649,6 +649,7 @@ var TablePlus = function TablePlus(props) {
   };
   //解除绑定标签
   var delLabelRelation = function delLabelRelation(id, type) {
+    var fn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
     request(apis.dict.delLabelRelation, {
       method: 'post',
       data: {
@@ -661,9 +662,7 @@ var TablePlus = function TablePlus(props) {
       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
+        fn();
       }
     });
   };
@@ -1303,7 +1302,10 @@ var TablePlus = function TablePlus(props) {
           setBizTagShow(false);
         });
       } else {
-        delLabelRelation(eventData === null || eventData === void 0 ? void 0 : eventData.businessLabelId, 2);
+        delLabelRelation(eventData === null || eventData === void 0 ? void 0 : eventData.businessLabelId, 2, function () {
+          props.Refresh();
+          state.updateEventMetas && state.updateEventMetas(); // 更新store
+        });
       }
     },
     onCancel: function onCancel() {
@@ -1391,14 +1393,21 @@ var TablePlus = function TablePlus(props) {
     okText: "\u786E\u5B9A",
     open: triggeringShow,
     onOk: function onOk() {
-      updateEvent({
-        triggeringOccasion: triggeringInput,
-        triggerLabelId: triTagId
-      }, function () {
-        setTriggeringShow(false);
-      });
-      if (!triTagId) {
-        delLabelRelation(eventData === null || eventData === void 0 ? void 0 : eventData.triggerLabelId, 3);
+      var onUpdateEvent = function onUpdateEvent() {
+        updateEvent({
+          triggeringOccasion: triggeringInput,
+          triggerLabelId: triTagId
+        }, function () {
+          setTriggeringShow(false);
+        });
+      };
+      //这个代表是解绑原来有id现在不传id
+      if (!triTagId && (eventData === null || eventData === void 0 ? void 0 : eventData.triggerLabelId)) {
+        delLabelRelation(eventData === null || eventData === void 0 ? void 0 : eventData.triggerLabelId, 3, function () {
+          onUpdateEvent();
+        });
+      } else {
+        onUpdateEvent();
       }
     },
     onCancel: function onCancel() {