@zgfe/modules-dm 1.0.57-zhongyuan.8 → 1.0.57-zhongyuan.81

package/es/modules/dataManage/collectionEventList.js

@@ -37,7 +37,8 @@ var CollectionEventList = function CollectionEventList(props) {
     currentApp = _useContext.currentApp,
     authority = _useContext.authority,
     route = _useContext.route,
-    isDemo = _useContext.isDemo;
+    isDemo = _useContext.isDemo,
+    showProdDownload = _useContext.showProdDownload;
   var _useContext2 = useContext(DmContext),
     state = _useContext2.state;
   var _useState = useState(0),
@@ -104,21 +105,39 @@ var CollectionEventList = function CollectionEventList(props) {
   var _useState27 = useState([{
       label: '全部埋点平台',
       value: -1
+    }, {
+      label: 'Unknown',
+      value: 0
     }, {
       label: 'JS',
-      value: 206
+      value: 3
     }, {
       label: 'Android',
-      value: 175
+      value: 1
     }, {
       label: 'IOS',
-      value: 174
+      value: 2
+    },
+    // { label: '其他', value: 99 },
+    {
+      label: '微信小程序',
+      value: 4
     }, {
-      label: '其他',
-      value: 99
+      label: '服务端',
+      value: 5
+    }, {
+      label: '鸿蒙',
+      value: 6
     }]),
     _useState28 = _slicedToArray(_useState27, 1),
     maidianList = _useState28[0];
+  //  {"id":0,"name":"Unknown","keys":["none"]},
+  //     {"id":1,"name":"Android","keys":["and"]},
+  //     {"id":2,"name":"IOS","keys":["ios"]},
+  //     {"id":3,"name":"Javascript","keys":["js"]},
+  //     {"id":4,"name":"微信小程序","keys":["wxa"]},
+  //     {"id":5,"name":"服务端","keys":["server"]},
+  //     {"id":6,"name":"鸿蒙","keys":["harmonyos"]}
   var _useState29 = useState([-1]),
     _useState30 = _slicedToArray(_useState29, 2),
     currentMaidian = _useState30[0],
@@ -434,8 +453,10 @@ var CollectionEventList = function CollectionEventList(props) {
     if (_renderData && _renderData.length > 0 && _renderData[0].groupId == undefined) {
       _renderData.map(function (item) {
         groupData.map(function (_item) {
-          if (_item.groupId === item._groupId && _tempGroupIdList.indexOf(item._groupId) === -1) {
-            _tempGroupIdList.push(item._groupId);
+          var _item$_groupId;
+          if (_item.groupId === item._groupId && _tempGroupIdList.indexOf((_item$_groupId = item._groupId) !== null && _item$_groupId !== void 0 ? _item$_groupId : _item.groupId) === -1) {
+            var _item$_groupId2;
+            _tempGroupIdList.push((_item$_groupId2 = item._groupId) !== null && _item$_groupId2 !== void 0 ? _item$_groupId2 : _item.groupId);
             _tempRenderData.push(_item);
           }
         });
@@ -459,7 +480,7 @@ var CollectionEventList = function CollectionEventList(props) {
       fileName: "\u5143\u4E8B\u4EF6\u5217\u8868_".concat(moment().format('YYYYMMDD'))
     }).then(function (res) {});
   };
-  var items = [{
+  var items = showProdDownload ? [{
     key: '2',
     disabled: !authority[1700636282],
     label: (/*#__PURE__*/React.createElement("a", {
@@ -484,7 +505,7 @@ var CollectionEventList = function CollectionEventList(props) {
       type: "xiazai1",
       size: 16,
       className: "creditPopClickIcon"
-    }), " ", /*#__PURE__*/React.createElement("span", null, "\u5BFC\u5165\u4E8B\u4EF6")))
+    }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5BFC\u5165\u4E8B\u4EF6")))
   }, {
     key: '4',
     disabled: isDemo || !authority[1722837261],
@@ -495,7 +516,7 @@ var CollectionEventList = function CollectionEventList(props) {
       type: "daochu1",
       size: 16,
       className: "creditPopClickIcon"
-    }), " ", /*#__PURE__*/React.createElement("span", null, "\u5BFC\u51FA\u4E8B\u4EF6")))
+    }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5BFC\u51FA\u4E8B\u4EF6")))
   }, {
     key: '5',
     label: (/*#__PURE__*/React.createElement("a", {
@@ -532,6 +553,31 @@ var CollectionEventList = function CollectionEventList(props) {
       size: 16,
       className: "creditPopClickIcon"
     }), /*#__PURE__*/React.createElement("span", null, "\u5BFC\u51FA\u6570\u636E\u5305")))
+  }] : [{
+    key: '2',
+    disabled: !authority[1700636282],
+    label: (/*#__PURE__*/React.createElement("a", {
+      className: "".concat(classPrefix, "-downItems"),
+      onClick: function onClick() {
+        return setEventGroupingShow(true);
+      }
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "guanli",
+      size: 16,
+      className: "creditPopClickIcon"
+    }), /*#__PURE__*/React.createElement("span", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406")))
+  }, {
+    key: '5',
+    label: (/*#__PURE__*/React.createElement("a", {
+      className: "".concat(classPrefix, "-downItems"),
+      onClick: function onClick() {
+        return setIsDevModalState(true);
+      }
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "icon-shishigailan",
+      size: 16,
+      className: "creditPopClickIcon"
+    }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5F00\u53D1\u7BA1\u7406")))
   }];
   // 提交测试报告
   var _Form$useForm = Form.useForm(),
@@ -551,7 +597,8 @@ var CollectionEventList = function CollectionEventList(props) {
             request(apis.createExport, {
               method: 'get',
               params: {
-                demandId: values === null || values === void 0 ? void 0 : values.demandId
+                demandId: values === null || values === void 0 ? void 0 : values.demandId,
+                appId: getAppID(currentApp)
               },
               responseType: 'blob',
               fileName: "\u6D4B\u8BD5\u62A5\u544A_".concat(moment().format('YYYYMMDD'))
@@ -559,18 +606,22 @@ var CollectionEventList = function CollectionEventList(props) {
             notification.success({
               message: '生成测试报告成功！'
             });
+            // 清空需求id
+            formReport.setFieldsValue({
+              demandId: ''
+            });
             setIsTextReport(false);
-            _context.next = 12;
+            _context.next = 13;
             break;
-          case 9:
-            _context.prev = 9;
+          case 10:
+            _context.prev = 10;
             _context.t0 = _context["catch"](0);
             console.log(_context.t0, '测试报告验证失败');
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 9]]);
+      }, _callee, null, [[0, 10]]);
     }));
     return function submitReport() {
       return _ref.apply(this, arguments);
@@ -594,7 +645,8 @@ var CollectionEventList = function CollectionEventList(props) {
             request(apis.exportData, {
               method: 'get',
               params: {
-                demandId: values === null || values === void 0 ? void 0 : values.demandId
+                demandId: values === null || values === void 0 ? void 0 : values.demandId,
+                appId: getAppID(currentApp)
               },
               responseType: 'blob',
               fileName: "\u6570\u636E\u5305_".concat(moment().format('YYYYMMDD'))
@@ -603,17 +655,21 @@ var CollectionEventList = function CollectionEventList(props) {
               message: '生成数据包成功！'
             });
             setIsExportData(false);
-            _context2.next = 12;
+            // 清空需求id
+            formExport.setFieldsValue({
+              demandId: ''
+            });
+            _context2.next = 13;
             break;
-          case 9:
-            _context2.prev = 9;
+          case 10:
+            _context2.prev = 10;
             _context2.t0 = _context2["catch"](0);
             console.log(_context2.t0, '测试数据包失败');
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 9]]);
+      }, _callee2, null, [[0, 10]]);
     }));
     return function submitExport() {
       return _ref2.apply(this, arguments);

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

@@ -58,7 +58,10 @@ var CreateMeta = function CreateMeta(props) {
     if (props.isShow) {
       form.resetFields(); // 重置表单数据
       setEventAttrList([]);
+      setTriTagId(undefined);
       setIsChange(false);
+      getTagList(2);
+      getTagList(3);
     }
   }, [props.isShow]);
   var submit = /*#__PURE__*/function () {
@@ -98,10 +101,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') {
@@ -402,20 +408,78 @@ var CreateMeta = function CreateMeta(props) {
   };
   // 埋点平台列表
   var _useState19 = useState([{
+      label: 'Unknown',
+      value: 0
+    }, {
       label: 'JS',
-      value: 206
+      value: 3
     }, {
       label: 'Android',
-      value: 175
+      value: 1
     }, {
       label: 'IOS',
-      value: 174
+      value: 2
+    },
+    // { label: '其他', value: 99 },
+    {
+      label: '微信小程序',
+      value: 4
+    }, {
+      label: '服务端',
+      value: 5
     }, {
-      label: '其他',
-      value: 99
+      label: '鸿蒙',
+      value: 6
     }]),
     _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 +549,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,
+      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
+      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/developModal/index.js

@@ -18,15 +18,15 @@ var classNames = 'devModel';
 export default (function (props) {
   var _useState = useState([{
       name: 'JS',
-      id: '206',
+      id: '3',
       icon: 'a-js2'
     }, {
-      name: 'IOS',
-      id: '175',
+      name: 'Android',
+      id: '1',
       icon: 'ios1'
     }, {
-      name: 'android',
-      id: '174',
+      name: 'IOS',
+      id: '2',
       icon: 'android1'
     }, {
       name: '更多',

package/es/modules/dataManage/components/eventFilter/index.js

@@ -11,8 +11,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { Tooltip, message } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
-import { BizEventSelector, BizAttrConditionGroup, IconFont } from '@zgfe/business-lib';
+import React, { useEffect, useRef, useState, useContext } from 'react';
+import { BizEventSelector, BizAttrConditionGroup, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import './styles/index.less';
 var classPrefix = 'virtual-event-eventfilter-box';
 var EventFilter = function EventFilter(props) {
@@ -20,6 +20,8 @@ var EventFilter = function EventFilter(props) {
     index = props.index,
     virtualDrawerType = props.virtualDrawerType,
     selectList = props.selectList;
+  var _useContext = useContext(BizGlobalDataContext),
+    envs = _useContext.envs;
   // 筛选条件个数
   var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -56,8 +58,8 @@ var EventFilter = function EventFilter(props) {
   // 添加筛选
   var onAdd = function onAdd() {
     // 最多可添加5条属性筛选
-    if (count >= 5) {
-      message.error('最多可添加5条属性筛选');
+    if (count >= ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5)) {
+      message.error("\u6700\u591A\u53EF\u6DFB\u52A0".concat((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5, "\u6761\u5C5E\u6027\u7B5B\u9009"));
       return;
     }
     if (selectList.length <= 0) {
@@ -122,7 +124,7 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count < 5 && selectList.length > 0 ? '' : 'disable'),
+    className: "".concat(count < ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 5) && selectList.length > 0 ? '' : 'disable'),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

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

@@ -93,7 +93,7 @@ var panelList = function panelList(props) {
         onClick: function onClick() {
           routerPanel(text);
         }
-      }, ' ', "\u94FE\u63A5", ' ');
+      }, "\u94FE\u63A5");
     }
   }];
   // 用户属性列表
@@ -120,7 +120,9 @@ var panelList = function panelList(props) {
     pie: '饼图',
     number: '数值',
     grid: '表格',
-    funnelBar: '漏斗图'
+    funnelBar: '漏斗图',
+    map: '地图',
+    boxplot: '盒须图'
   };
   //查询看板列表
   var eventCiteEvent = function eventCiteEvent() {

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

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