@zgfe/modules-dm 1.0.57-zhongyuan.19 → 1.0.57-zhongyuan.20

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

@@ -59,6 +59,8 @@ var CreateMeta = function CreateMeta(props) {
       form.resetFields(); // 重置表单数据
       setEventAttrList([]);
       setIsChange(false);
+      getTagList(2);
+      getTagList(3);
     }
   }, [props.isShow]);
   var submit = /*#__PURE__*/function () {
@@ -98,10 +100,13 @@ var CreateMeta = function CreateMeta(props) {
                 eventName: values.eventName,
                 aliasName: values.aliasName,
                 demandId: values.demandId,
-                triggeringOccasion: values.triggeringOccasion,
+                // triggeringOccasion: values.triggeringOccasion,
                 eventAttrList: eventAttrList,
                 platformStr: values === null || values === void 0 ? void 0 : values.maidianID.join(),
-                remark: values === null || values === void 0 ? void 0 : values.remark
+                remark: values === null || values === void 0 ? void 0 : values.remark,
+                businessLabelId: values.businessLabelId,
+                triggerLabelId: triTagId,
+                triggeringOccasion: triTagInput
               }
             }).then(function (res) {
               if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
@@ -376,8 +381,6 @@ var CreateMeta = function CreateMeta(props) {
   useEffect(function () {
     var _Y = getTableScroll(376, 'dataManageCreateMetaTable');
     setScrollY(_Y);
-    getTagList(2);
-    getTagList(3);
   }, []);
   var onClose = function onClose() {
     if (isChange) {
@@ -426,18 +429,29 @@ var CreateMeta = function CreateMeta(props) {
     _useState24 = _slicedToArray(_useState23, 2),
     triTag = _useState24[0],
     setTriTag = _useState24[1];
+  var _useState25 = useState(),
+    _useState26 = _slicedToArray(_useState25, 2),
+    triTagId = _useState26[0],
+    setTriTagId = _useState26[1];
+  var _useState27 = useState(),
+    _useState28 = _slicedToArray(_useState27, 2),
+    triTagInput = _useState28[0],
+    setTriTagInput = _useState28[1];
   //标签列表数据 2:业务标签 3:触发标签
   var getTagList = function getTagList(type) {
     request(apis.dict.eventTag, {
-      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
-      type: type
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
+        labelType: type
+      }
     }).then(function (res) {
-      if (res.code == '100000') {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         switch (type) {
           case 2:
             setBizTag(res.data.map(function (res) {
               return {
-                label: res.name,
+                label: res.labelName,
                 value: res.id
               };
             }));
@@ -445,7 +459,7 @@ var CreateMeta = function CreateMeta(props) {
           case 3:
             setTriTag(res.data.map(function (res) {
               return {
-                label: res.name,
+                label: res.labelName,
                 value: res.id
               };
             }));
@@ -531,8 +545,10 @@ var CreateMeta = function CreateMeta(props) {
       marginRight: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
+    defaultValue: triTagId,
     options: triTag,
-    onChange: function onChange() {
+    onChange: function onChange(value) {
+      setTriTagId(value);
       setIsChange(true);
     }
   }), "\u6216", /*#__PURE__*/React.createElement(Input, {
@@ -542,13 +558,15 @@ var CreateMeta = function CreateMeta(props) {
       marginLeft: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A\uFF0C\u4F8B\u5982\uFF1A\u7528\u6237\u70B9\u51FB\u786E\u8BA4\u6309\u94AE",
+    defaultValue: triTagInput,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
+      setTriTagInput(e.target.value);
       setIsChange(true);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "triggeringOccasion1",
+    name: "businessLabelId",
     label: "\u4E1A\u52A1\u6807\u7B7E"
   }, /*#__PURE__*/React.createElement(Select, {
     allowClear: true,

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

@@ -18,7 +18,14 @@ interface DataType {
     owner: string;
     triggeringOccasion: string;
     canDel: boolean;
-    triggeringTag: string;
+    businessLabelId: string;
+    triggerLabelId: string;
+    triggerLabel: labelData;
+    businessLabel: labelData;
+}
+interface labelData {
+    labelName: string;
+    id: number;
 }
 interface queryPlanType {
     unexpectedPropList: string[];

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

@@ -77,7 +77,7 @@ var TablePlus = function TablePlus(props) {
         eventId: aliasNameId
       }
     }).then(function (res) {
-      if (res.data === 0) {
+      if ((res === null || res === void 0 ? void 0 : res.data) === 0) {
         message.error(res.msg);
       } else {
         message.success('修改成功');
@@ -115,7 +115,7 @@ var TablePlus = function TablePlus(props) {
         eventId: triggeringId
       }
     }).then(function (res) {
-      if (res.data === 0) {
+      if ((res === null || res === void 0 ? void 0 : res.data) === 0) {
         message.error(res.msg);
       } else {
         message.success('修改成功');
@@ -554,7 +554,7 @@ var TablePlus = function TablePlus(props) {
         platform: currentMaidian.join()
       }
     }).then(function (res) {
-      if (res.code == '100000') {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         notification.success({
           message: '更新成功'
         });
@@ -584,7 +584,7 @@ var TablePlus = function TablePlus(props) {
         remark: currentRemark
       }
     }).then(function (res) {
-      if (res.code == '100000') {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         notification.success({
           message: '更新成功'
         });
@@ -622,13 +622,12 @@ var TablePlus = function TablePlus(props) {
     _useState52 = _slicedToArray(_useState51, 2),
     triTagId = _useState52[0],
     setTriTagId = _useState52[1];
-  // const [triTagShow,setTriTagShow] = useState(false)
   var getTagList = function getTagList(type) {
     request(apis.dict.eventTag, {
-      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
-      type: type
+      appId: getAppID(currentApp),
+      labelType: type
     }).then(function (res) {
-      if (res.code == '100000') {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         switch (type) {
           case 2:
             setBizTag(res.data.map(function (res) {
@@ -650,23 +649,30 @@ var TablePlus = function TablePlus(props) {
       }
     });
   };
-  var submitBizTag = function submitBizTag() {
-    request(apis.dict.addLabelRelation, {
-      id: bizTagId,
-      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
-      labelType: 2,
-      eventId: eventId
+  var updateEvent = function updateEvent(params) {
+    var fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
+    if (params.triggeringOccasion && params.triggeringOccasion.length > 128) {
+      message.error('名称不可超过128字符');
+      return;
+    }
+    request(apis.updateEventInfo, {
+      method: 'post',
+      data: _objectSpread({
+        appId: getAppID(currentApp),
+        eventId: eventId
+      }, params)
     }).then(function (res) {
-      if (res.code == 100000) {
-        message.success('修改成功!');
-        setBizTagShow(false);
+      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
       }
+    }).finally(function () {
+      fn();
     });
   };
-  // useEffect(() => {
-  //   getTagList(2)
-  //   getTagList(3)
-  // },[])
   var columns = [{
     title: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       style: {
@@ -788,19 +794,19 @@ var TablePlus = function TablePlus(props) {
     }
   }, {
     title: '业务标签',
-    dataIndex: 'alias_name',
+    dataIndex: 'businessLabelId',
     key: 'alias_name',
     width: 167,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement("div", {
         className: "alias_name"
-      }, ' ', /*#__PURE__*/React.createElement(Tag, {
+      }, ' ', record.businessLabel ? /*#__PURE__*/React.createElement(Tag, {
         color: "blue"
-      }, "\u4E1A\u52A1\u6807\u7B7E"), /*#__PURE__*/React.createElement(IconFont, {
+      }, record.businessLabel.labelName) : '', /*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
           getTagList(2);
-          setBizTagId('1');
+          setBizTagId(record.businessLabelId);
           setBizTagShow(true);
           setEventId(record.event_id);
         },
@@ -821,24 +827,24 @@ var TablePlus = function TablePlus(props) {
             width: '200px',
             wordBreak: 'break-all'
           }
-        }, (record === null || record === void 0 ? void 0 : record.triggeringTag) ? (/*#__PURE__*/React.createElement(Tag, {
+        }, (record === null || record === void 0 ? void 0 : record.triggerLabel) ? (/*#__PURE__*/React.createElement(Tag, {
           color: "orange"
-        }, record.triggeringTag)) : record.triggeringOccasion),
+        }, record.triggerLabel.labelName)) : record.triggeringOccasion),
         trigger: "hover",
         placement: "top"
-      }, /*#__PURE__*/React.createElement("div", {
+      }, record.triggerLabel ? record.triggerLabel.labelName : (/*#__PURE__*/React.createElement("div", {
         className: "alias_name_text"
-      }, record.triggeringOccasion)), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
+      }, record.triggeringOccasion))), /*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
           getTagList(3);
-          setTriTagId('2');
+          setTriTagId(record.triggerLabelId);
           setTriggeringInput(record.triggeringOccasion);
           setTriggeringId(record.event_id);
           setTriggeringShow(true);
         },
         type: "zhongmingming"
-      })));
+      }));
     }
   },
   // {
@@ -1171,7 +1177,7 @@ var TablePlus = function TablePlus(props) {
         reason: offlineText
       }
     }).then(function (res) {
-      if (res.code == '100000') {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         notification.success({
           message: '下线成功'
         });
@@ -1303,7 +1309,13 @@ var TablePlus = function TablePlus(props) {
     centered: true,
     okText: "\u786E\u5B9A",
     open: bizTagShow,
-    onOk: submitBizTag,
+    onOk: function onOk() {
+      updateEvent({
+        businessLabelId: bizTagId
+      }, function () {
+        setBizTagShow(false);
+      });
+    },
     onCancel: function onCancel() {
       setBizTagShow(false);
     },
@@ -1387,7 +1399,14 @@ var TablePlus = function TablePlus(props) {
     centered: true,
     okText: "\u786E\u5B9A",
     open: triggeringShow,
-    onOk: triggeringEdit,
+    onOk: function onOk() {
+      updateEvent({
+        triggeringOccasion: triggeringInput,
+        triggerLabelId: triTagId
+      }, function () {
+        setTriggeringShow(false);
+      });
+    },
     onCancel: function onCancel() {
       setTriggeringInput('');
       setTriggeringId(-1);

package/es/modules/formulateRule/index.js

@@ -391,7 +391,7 @@ var FormulateRule = function FormulateRule() {
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: allOpenRule,
     onChange: handleAllOpenStatus
-  }))), /*#__PURE__*/React.createElement(Button, {
+  }))), authority[170928557426] && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -399,7 +399,7 @@ var FormulateRule = function FormulateRule() {
     onClick: function onClick() {
       return setIsModalOpen(true);
     }
-  }, "\u751F\u6210\u62A5\u544A"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u751F\u6210\u62A5\u544A")), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.19",
+  "version": "1.0.57-zhongyuan.20",
   "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": "497fefa577adb1e0c82e3e9682667d884c3ad986",
+  "gitHead": "0179498816e7c9f7930ef7d39470aba187beae4b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }