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

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

@@ -376,6 +376,8 @@ var CreateMeta = function CreateMeta(props) {
   useEffect(function () {
     var _Y = getTableScroll(376, 'dataManageCreateMetaTable');
     setScrollY(_Y);
+    getTagList(2);
+    getTagList(3);
   }, []);
   var onClose = function onClose() {
     if (isChange) {
@@ -416,6 +418,42 @@ var CreateMeta = function CreateMeta(props) {
     }]),
     _useState20 = _slicedToArray(_useState19, 1),
     maidianList = _useState20[0];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    bizTag = _useState22[0],
+    setBizTag = _useState22[1];
+  var _useState23 = useState([]),
+    _useState24 = _slicedToArray(_useState23, 2),
+    triTag = _useState24[0],
+    setTriTag = _useState24[1];
+  //标签列表数据 2:业务标签 3:触发标签
+  var getTagList = function getTagList(type) {
+    request(apis.dict.eventTag, {
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
+      type: type
+    }).then(function (res) {
+      if (res.code == '100000') {
+        switch (type) {
+          case 2:
+            setBizTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
+  };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
     width: 1000,
@@ -485,9 +523,23 @@ var CreateMeta = function CreateMeta(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "triggeringOccasion",
     label: "\u89E6\u53D1\u65F6\u673A"
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(Select, {
+    allowClear: true,
     style: {
-      border: 0
+      border: 0,
+      width: '160px',
+      marginRight: '10px'
+    },
+    placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
+    options: triTag,
+    onChange: function onChange() {
+      setIsChange(true);
+    }
+  }), "\u6216", /*#__PURE__*/React.createElement(Input, {
+    style: {
+      border: 0,
+      width: 'calc(100% - 195px)',
+      marginLeft: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A\uFF0C\u4F8B\u5982\uFF1A\u7528\u6237\u70B9\u51FB\u786E\u8BA4\u6309\u94AE",
     showCount: true,
@@ -495,6 +547,16 @@ var CreateMeta = function CreateMeta(props) {
     onChange: function onChange(e) {
       setIsChange(true);
     }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "triggeringOccasion1",
+    label: "\u4E1A\u52A1\u6807\u7B7E"
+  }, /*#__PURE__*/React.createElement(Select, {
+    allowClear: true,
+    placeholder: "\u8BF7\u8F93\u5165\u4E1A\u52A1\u6807\u7B7E",
+    options: bizTag,
+    onChange: function onChange() {
+      setIsChange(true);
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "maidianID",
     label: "\u57CB\u70B9\u5E73\u53F0"

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

@@ -18,6 +18,7 @@ interface DataType {
     owner: string;
     triggeringOccasion: string;
     canDel: boolean;
+    triggeringTag: string;
 }
 interface queryPlanType {
     unexpectedPropList: string[];

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

@@ -597,6 +597,76 @@ var TablePlus = function TablePlus(props) {
       });
     });
   };
+  //标签列表数据 2:业务标签 3:触发标签
+  var _useState41 = useState(),
+    _useState42 = _slicedToArray(_useState41, 2),
+    eventId = _useState42[0],
+    setEventId = _useState42[1];
+  var _useState43 = useState([]),
+    _useState44 = _slicedToArray(_useState43, 2),
+    bizTag = _useState44[0],
+    setBizTag = _useState44[1];
+  var _useState45 = useState(),
+    _useState46 = _slicedToArray(_useState45, 2),
+    bizTagId = _useState46[0],
+    setBizTagId = _useState46[1];
+  var _useState47 = useState(false),
+    _useState48 = _slicedToArray(_useState47, 2),
+    bizTagShow = _useState48[0],
+    setBizTagShow = _useState48[1];
+  var _useState49 = useState([]),
+    _useState50 = _slicedToArray(_useState49, 2),
+    triTag = _useState50[0],
+    setTriTag = _useState50[1];
+  var _useState51 = useState(),
+    _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
+    }).then(function (res) {
+      if (res.code == '100000') {
+        switch (type) {
+          case 2:
+            setBizTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
+  };
+  var submitBizTag = function submitBizTag() {
+    request(apis.dict.addLabelRelation, {
+      id: bizTagId,
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
+      labelType: 2,
+      eventId: eventId
+    }).then(function (res) {
+      if (res.code == 100000) {
+        message.success('修改成功!');
+        setBizTagShow(false);
+      }
+    });
+  };
+  // useEffect(() => {
+  //   getTagList(2)
+  //   getTagList(3)
+  // },[])
   var columns = [{
     title: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       style: {
@@ -716,6 +786,27 @@ var TablePlus = function TablePlus(props) {
         type: "zhongmingming"
       }));
     }
+  }, {
+    title: '业务标签',
+    dataIndex: 'alias_name',
+    key: 'alias_name',
+    width: 167,
+    render: function render(_, record) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "alias_name"
+      }, ' ', /*#__PURE__*/React.createElement(Tag, {
+        color: "blue"
+      }, "\u4E1A\u52A1\u6807\u7B7E"), /*#__PURE__*/React.createElement(IconFont, {
+        className: "edit-alias-name",
+        onClick: function onClick() {
+          getTagList(2);
+          setBizTagId('1');
+          setBizTagShow(true);
+          setEventId(record.event_id);
+        },
+        type: "zhongmingming"
+      }));
+    }
   }, {
     title: '触发时机',
     dataIndex: 'triggeringOccasion',
@@ -730,7 +821,9 @@ var TablePlus = function TablePlus(props) {
             width: '200px',
             wordBreak: 'break-all'
           }
-        }, record.triggeringOccasion),
+        }, (record === null || record === void 0 ? void 0 : record.triggeringTag) ? (/*#__PURE__*/React.createElement(Tag, {
+          color: "orange"
+        }, record.triggeringTag)) : record.triggeringOccasion),
         trigger: "hover",
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
@@ -738,6 +831,8 @@ var TablePlus = function TablePlus(props) {
       }, record.triggeringOccasion)), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
+          getTagList(3);
+          setTriTagId('2');
           setTriggeringInput(record.triggeringOccasion);
           setTriggeringId(record.event_id);
           setTriggeringShow(true);
@@ -1053,19 +1148,19 @@ var TablePlus = function TablePlus(props) {
     }
   }];
   //看板引用次数
-  var _useState41 = useState(false),
-    _useState42 = _slicedToArray(_useState41, 2),
-    panelShow = _useState42[0],
-    setPanelShow = _useState42[1];
+  var _useState53 = useState(false),
+    _useState54 = _slicedToArray(_useState53, 2),
+    panelShow = _useState54[0],
+    setPanelShow = _useState54[1];
   //下线功能
-  var _useState43 = useState(false),
-    _useState44 = _slicedToArray(_useState43, 2),
-    offlineShow = _useState44[0],
-    setOfflineShow = _useState44[1];
-  var _useState45 = useState(''),
-    _useState46 = _slicedToArray(_useState45, 2),
-    offlineText = _useState46[0],
-    setOfflineText = _useState46[1];
+  var _useState55 = useState(false),
+    _useState56 = _slicedToArray(_useState55, 2),
+    offlineShow = _useState56[0],
+    setOfflineShow = _useState56[1];
+  var _useState57 = useState(''),
+    _useState58 = _slicedToArray(_useState57, 2),
+    offlineText = _useState58[0],
+    setOfflineText = _useState58[1];
   //功能下线
   var offlineEvent = function offlineEvent() {
     request(apis.offlineEvent, {
@@ -1090,10 +1185,10 @@ var TablePlus = function TablePlus(props) {
       });
     });
   };
-  var _useState47 = useState(''),
-    _useState48 = _slicedToArray(_useState47, 2),
-    scrollY = _useState48[0],
-    setScrollY = _useState48[1];
+  var _useState59 = useState(''),
+    _useState60 = _slicedToArray(_useState59, 2),
+    scrollY = _useState60[0],
+    setScrollY = _useState60[1];
   //页面加载完成后才能获取到对应的元素及其位置
   useEffect(function () {
     var _Y = getTableScroll(102, 'dataManageTablePlus');
@@ -1204,6 +1299,35 @@ var TablePlus = function TablePlus(props) {
   }, "\u901A\u8FC7"), /*#__PURE__*/React.createElement(Radio, {
     value: false
   }, "\u5931\u8D25"))))), /*#__PURE__*/React.createElement(Modal, {
+    title: "\u4FEE\u6539\u4E1A\u52A1\u6807\u7B7E",
+    centered: true,
+    okText: "\u786E\u5B9A",
+    open: bizTagShow,
+    onOk: submitBizTag,
+    onCancel: function onCancel() {
+      setBizTagShow(false);
+    },
+    width: 520,
+    destroyOnClose: true
+  }, /*#__PURE__*/React.createElement(Select, {
+    style: {
+      width: '100%'
+    },
+    className: "top-select",
+    options: bizTag,
+    defaultValue: bizTagId,
+    placeholder: "\u8BF7\u9009\u62E9\u4E1A\u52A1\u6807\u7B7E",
+    allowClear: true,
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#5f6085'
+      }
+    }),
+    onChange: function onChange(newValue) {
+      setBizTagId(newValue);
+    }
+  })), /*#__PURE__*/React.createElement(Modal, {
     title: "\u7F16\u8F91\u57CB\u70B9\u5E73\u53F0",
     centered: true,
     okText: "\u786E\u5B9A",
@@ -1268,10 +1392,29 @@ var TablePlus = function TablePlus(props) {
       setTriggeringInput('');
       setTriggeringId(-1);
       setTriggeringShow(false);
+      setTriTagId(undefined);
     },
     width: 520,
     destroyOnClose: true
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(Select, {
+    style: {
+      width: '100%'
+    },
+    className: "top-select",
+    options: triTag,
+    defaultValue: triTagId,
+    placeholder: "\u8BF7\u9009\u62E9\u89E6\u53D1\u6807\u7B7E",
+    allowClear: true,
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#5f6085'
+      }
+    }),
+    onChange: function onChange(newValue) {
+      setTriTagId(newValue);
+    }
+  }), "\u6216", /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A",
     maxLength: 128,
     defaultValue: triggeringInput,

package/es/modules/dataManage/types.d.ts

@@ -84,3 +84,7 @@ export interface CreateMetaDrawerProps {
 }
 export interface DevelopModelProps {
 }
+export interface eventTag {
+    label: string;
+    value: number;
+}

package/es/modules/formulateRule/index.js

@@ -104,7 +104,6 @@ var FormulateRule = function FormulateRule() {
         status: ruleObj.status ? 0 : 1
       }
     }).then(function (res) {
-      if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100001') {
         if (res.data.data == 1) {
           UseModal({
@@ -151,11 +150,13 @@ var FormulateRule = function FormulateRule() {
           });
           return;
         }
-      } else if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        return;
+      }
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         endOpen(ruleObj);
-      } else {
-        message.error(res.msg);
+        return;
       }
+      message.error(res.msg);
     });
   };
   var endOpen = function endOpen(ruleObj) {
@@ -166,7 +167,6 @@ var FormulateRule = function FormulateRule() {
         status: ruleObj.status ? 0 : 1
       }
     }).then(function (res) {
-      if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         message.success("".concat(ruleObj.status ? '关闭' : '开启', "\u6210\u529F\uFF01"));
         getList(ruleSearchName);
@@ -287,6 +287,7 @@ var FormulateRule = function FormulateRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }

package/package.json

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