@zgfe/modules-dm 1.0.57-alpha.0 → 1.0.57-zhongyuan-dz.2

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

@@ -98,10 +98,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,6 +379,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 +421,53 @@ 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];
+  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, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
+        labelType: type
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        switch (type) {
+          case 2:
+            setBizTag(res.data.map(function (res) {
+              return {
+                label: res.labelName,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.labelName,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
+  };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
     width: 1000,
@@ -485,14 +537,42 @@ 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",
+    defaultValue: triTagId,
+    options: triTag,
+    onChange: function onChange(value) {
+      setTriTagId(value);
+      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",
+    defaultValue: triTagInput,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
+      setTriTagInput(e.target.value);
+      setIsChange(true);
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "businessLabelId",
+    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, {

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

@@ -139,7 +139,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     eventMoveShow = _useState8[0],
     setEventMoveShow = _useState8[1];
-  var eventMoveChangeId = -1;
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
     eventMoveOption = _useState10[0],
@@ -160,7 +159,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     if (data.length > 0) {
       setEventMoveShow(groupId);
       dmEventGroupId = groupId;
-      eventMoveChangeId = data.groupingOption[0].value;
       dmEventMoveChangeId = data.groupingOption[0].value;
     } else {
       setEventMoveShow(undefined);
@@ -197,7 +195,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     });
   };
   var moveContent = function moveContent() {
-    eventMoveChangeId = eventMoveOption[0].value || -1;
     return /*#__PURE__*/React.createElement("div", {
       className: "move-content"
     }, /*#__PURE__*/React.createElement("div", null, "\u5C06", eventMoveLength, "\u4E2A\u6307\u6807\u79FB\u52A8\u5230\u4EE5\u4E0B\u5206\u7EC4"), /*#__PURE__*/React.createElement("div", null, "\u9009\u62E9\u5206\u7EC4", ' ', /*#__PURE__*/React.createElement(Select, {
@@ -206,7 +203,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         width: 120
       },
       onChange: function onChange(id) {
-        eventMoveChangeId = id;
+        dmEventMoveChangeId = id;
       },
       options: eventMoveOption
     })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {

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

@@ -82,7 +82,7 @@ var panelList = function panelList(props) {
     }
   }, {
     title: '看板链接',
-    dataIndex: 'id',
+    dataIndex: 'panelId',
     width: 150,
     render: function render(text) {
       return /*#__PURE__*/React.createElement(Button, {

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

@@ -18,6 +18,14 @@ interface DataType {
     owner: string;
     triggeringOccasion: string;
     canDel: boolean;
+    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

@@ -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: '更新成功'
         });
@@ -597,6 +597,82 @@ 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];
+  var getTagList = function getTagList(type) {
+    request(apis.dict.eventTag, {
+      appId: getAppID(currentApp),
+      labelType: type
+    }).then(function (res) {
+      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,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
+  };
+  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.data === 0) {
+        message.error(res.msg);
+      } else {
+        message.success('修改成功');
+        props.Refresh();
+        state.updateEventMetas && state.updateEventMetas(); // 更新store
+      }
+    }).finally(function () {
+      fn();
+    });
+  };
   var columns = [{
     title: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       style: {
@@ -716,6 +792,27 @@ var TablePlus = function TablePlus(props) {
         type: "zhongmingming"
       }));
     }
+  }, {
+    title: '业务标签',
+    dataIndex: 'businessLabelId',
+    key: 'alias_name',
+    width: 167,
+    render: function render(_, record) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "alias_name"
+      }, ' ', record.businessLabel ? /*#__PURE__*/React.createElement(Tag, {
+        color: "blue"
+      }, record.businessLabel.labelName) : '', /*#__PURE__*/React.createElement(IconFont, {
+        className: "edit-alias-name",
+        onClick: function onClick() {
+          getTagList(2);
+          setBizTagId(record.businessLabelId);
+          setBizTagShow(true);
+          setEventId(record.event_id);
+        },
+        type: "zhongmingming"
+      }));
+    }
   }, {
     title: '触发时机',
     dataIndex: 'triggeringOccasion',
@@ -730,20 +827,24 @@ var TablePlus = function TablePlus(props) {
             width: '200px',
             wordBreak: 'break-all'
           }
-        }, record.triggeringOccasion),
+        }, (record === null || record === void 0 ? void 0 : record.triggerLabel) ? (/*#__PURE__*/React.createElement(Tag, {
+          color: "orange"
+        }, 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(record.triggerLabelId);
           setTriggeringInput(record.triggeringOccasion);
           setTriggeringId(record.event_id);
           setTriggeringShow(true);
         },
         type: "zhongmingming"
-      })));
+      }));
     }
   },
   // {
@@ -1053,19 +1154,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, {
@@ -1076,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: '下线成功'
         });
@@ -1090,10 +1191,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 +1305,41 @@ 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: function onOk() {
+      updateEvent({
+        businessLabelId: bizTagId
+      }, function () {
+        setBizTagShow(false);
+      });
+    },
+    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",
@@ -1263,15 +1399,41 @@ 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);
       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/{formulate-rule → formulateRule}/addFormulate.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 interface Result {
     appId: number;
     isDelete: number;

package/es/modules/{formulate-rule → formulateRule}/addFormulate.js

@@ -12,7 +12,7 @@ import { Drawer, Input, Button, Space, Form, Table, Select, message } from 'antd
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useState, useEffect, useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import AddRule from './addRule';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
@@ -169,6 +169,31 @@ var AddFormulate = function AddFormulate(_ref) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         setRuleList(res.data.data);
+        // 回显
+        if (detailData) {
+          var _detailData$rinseObje2, _detailData$rinseShif;
+          ruleForm.setFieldsValue({
+            name: detailData.ruleName,
+            description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
+            target: res.data.data.find(function (o) {
+              var _detailData$rinseObje;
+              return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
+            }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
+            ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
+          });
+          var arr = detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
+            return {
+              currentType: o.ruleType,
+              currentTypeName: typeArr.filter(function (j) {
+                return j.value == o.ruleType;
+              })[0].label,
+              sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
+              targetValue: o.targetValue,
+              key: o.id
+            };
+          });
+          setDataSoure(arr || []);
+        }
       }
     });
   };
@@ -196,29 +221,6 @@ var AddFormulate = function AddFormulate(_ref) {
       });
     }
   };
-  // 回显
-  useEffect(function () {
-    if (detailData) {
-      ruleForm.setFieldsValue({
-        name: detailData.ruleName,
-        description: detailData.ruleDescription,
-        target: detailData.rinseObjects[0],
-        ruleArr: detailData.rinseShiftRuleDetails
-      });
-      var arr = detailData.rinseShiftRuleDetails.map(function (o) {
-        return {
-          currentType: o.ruleType,
-          currentTypeName: typeArr.filter(function (j) {
-            return j.value == o.ruleType;
-          })[0].label,
-          sourceValue: o.ruleType == 5 ? '' : o.sourceValue,
-          targetValue: o.targetValue,
-          key: o.id
-        };
-      });
-      setDataSoure(arr);
-    }
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "addRule"
   }, /*#__PURE__*/React.createElement(Drawer, {

package/es/modules/{formulate-rule → formulateRule}/addRule.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 interface TypeRule {
     key: string;
     currentType: number;

package/es/modules/{formulate-rule → formulateRule}/addRule.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { Drawer, Input, Button, Space, Form, Table, Select } from 'antd';
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import { typeArr, dateArr, tianchongArr, shuzhiArr } from './data';
 var AddRule = function AddRule(_ref) {
   var addruleShow = _ref.addruleShow,

package/es/modules/{formulate-rule → formulateRule}/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 declare const FormulateRule: React.FC;
 export default FormulateRule;