@zgfe/modules-dm 1.0.57-zhongyuan.7 → 1.0.57-zhongyuan.71

package/es/modules/dataManage/collectionAttributeList.js

@@ -1,19 +1,19 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { BizGlobalDataContext, IconFont, ajax } from '@zgfe/business-lib';
 import { Input, Button, Select, Table, message, Modal, Upload, Popover, Checkbox, notification } from 'antd';
 import React, { useEffect, useState, useContext } from 'react';
@@ -29,12 +29,26 @@ import BizEditText from './components/editTxt';
 import _ from 'lodash';
 import moment from 'moment';
 import UseModal from '../CutsModal';
+// 内置属性白名单
+var ownerWhiteList = [{
+  dt: 'evt',
+  pr: ['ct', 'tz', 'an', 'vn', 'cr', 'cn', 'os', 'ov', 'mnet', 'net', 'dru', 'cuid', 'sid', 'ref', 'eid', 'referrer_domain', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term']
+}, {
+  dt: 'abp',
+  pr: ['ct', 'tz', 'sid', 'vn', 'cuid', 'url', 'ref', 'referrer_domain', 'cr', 'net', 'vn', 'ov', 'os', 'an', 'cn', 'mnet', 'scroll', 'dr', 'page_url', 'page_title', 'landing_page', 'title', 'share_level', 'uid', 'share_id', 'path', 'productID', 'revenueType', 'price', 'total', 'productQuantity', 'element_id', 'element_content', 'element_type', 'element_style', 'element_selector', 'eid']
+}];
+//事件名称（包含：pv（⻚⾯访问）、click（⻚⾯点击）、scroll（滚动）、dr（⻚⾯停留时⻓）、wxsopen（分享打开）、wxshare（微信分享）、revenue（收⼊））
+var eventWhiteList = ['pv', 'click', 'scroll', 'dr', 'wxsopen', 'wxshare', 'revenue'];
+var ownerWhiteListDataList = ownerWhiteList.map(function (item) {
+  return _toConsumableArray(item.pr);
+}).flat();
 var CollectionAttributeList = function CollectionAttributeList(props) {
   var classPrefix = 'attr-list';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     isDemo = _useContext.isDemo,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var isOpen = props.isOpen,
     queryPlanData = props.queryPlanData,
     source = props.source,
@@ -70,7 +84,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var uniqueAttrs = ['name', 'app_user_id'];
   // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
   var rowRenderHandle = function rowRenderHandle(name) {
-    if (source == 'event' && eventAttrsData.owner == 'zg_abp') {
+    if (source == 'event' && ownerWhiteListDataList.find(function (o) {
+      return o == eventAttrsData.attr_name;
+    })) {
       // 内置事件属性
       return false;
     }
@@ -120,10 +136,19 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     if (source == 'user') {
       queryUserPropMeta();
     } else {
+      var ownerEventName = (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name) || '';
       var _temp = eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (item) {
         item.name = item.attr_name;
         item.type = item.prop_type;
-        return item;
+        if (eventWhiteList.includes(ownerEventName) && ownerWhiteListDataList.includes(item === null || item === void 0 ? void 0 : item.attr_name)) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            newOwner: 'zg_abp'
+          });
+        } else {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            newOwner: 'zg'
+          });
+        }
       }) // 业务不展示
       .filter(function (item) {
         return item.attr_id != 31415926;
@@ -290,7 +315,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          record.category === 'fixed' || record.owner == 'zg_abp',
+          record.newOwner == 'zg_abp' || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -318,7 +343,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          record.category === 'fixed' || record.owner == 'zg_abp',
+          record.newOwner == 'zg_abp' || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -414,7 +439,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || !record.canUpdate || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -471,7 +496,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'hidden');
         },
@@ -533,7 +558,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'encryption_type');
         },
@@ -659,14 +684,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    dataIndex: 'owner',
+    dataIndex: 'newOwner',
     width: 120,
-    render: function render(owner) {
+    render: function render(record) {
       var json = {
         zg_abp: '内置',
         zg: '自定义'
       };
-      return /*#__PURE__*/React.createElement("div", null, json[owner]);
+      return /*#__PURE__*/React.createElement("div", null, json[record]);
     }
   }]), [{
     title: '操作',
@@ -678,7 +703,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           padding: 0
         },
-        disabled: source === 'event' ? record.owner == 'zg_abp' || !authority[1000004] : record.category == 'fixed' || isDemo || !authority[1000004],
+        disabled: source === 'event' ? record.newOwner == 'zg_abp' || !authority[1000004] || !record.canUpdate : record.category == 'fixed' || isDemo || !authority[1000004],
         onClick: function onClick() {
           if (isDemo || !authority[1000004]) {
             message.error('无删除权限');
@@ -912,7 +937,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     width: 64,
     render: function render(_, record, index) {
       return /*#__PURE__*/React.createElement("a", {
-        className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
+        className: "set ".concat(eventWhiteList.includes(record.attr_name) ? 'set-error' : ''),
         onClick: function onClick() {
           return dealEventAttr(index);
         }
@@ -968,8 +993,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     removeAttrData = _useState34[0],
     setRemoveAttrData = _useState34[1];
   var saveRemoveAttrData = function saveRemoveAttrData(record) {
-    // 新加逻辑--在数据清洗自定义规则中绑定有此原事件不可删除。canDel:false 不允许删除
-    if (!record.canDel) {
+    // // 新加逻辑--在数据清洗自定义规则中绑定有此原事件不可删除。canDel:false 不允许删除
+    if (source == 'event' && !record.canUpdate) {
       UseModal({
         onOk: function onOk() {},
         okText: '确定',
@@ -1132,7 +1157,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   //页面加载完成后才能获取到对应的元素及其位置
   useEffect(function () {
     var _Y = getTableScroll(60, 'dataManageAttrTable');
-    // console.log('_Y', _Y);
     setScrollY(_Y);
   }, []);
   return /*#__PURE__*/React.createElement("div", {
@@ -1171,14 +1195,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     onClick: function onClick() {
       return setCreateAttrShow(true);
     }
-  }, "\u521B\u5EFA\u5C5E\u6027"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u521B\u5EFA\u5C5E\u6027"), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "button",
     disabled: isDemo || !authority[1722838544],
     onClick: function onClick() {
       return setOpenImportModal(true);
     }
-  }, "\u5BFC\u5165\u5C5E\u6027")))), /*#__PURE__*/React.createElement(Table, {
+  }, "\u5BFC\u5165\u5C5E\u6027"))))), /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     id: 'dataManageAttrTable',
@@ -1201,7 +1225,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }).filter(function (item) {
       return category == '' || item.category === category;
     }).filter(function (item) {
-      return owner == '' || item.owner === owner;
+      return owner == '' || item.newOwner === owner;
     }),
     pagination: false
   }), source == 'event' && (/*#__PURE__*/React.createElement(Button, {
@@ -1233,7 +1257,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         name: '',
         aliasName: '',
         type: 1,
-        encryptionType: 0
+        encryptionType: 0,
+        newOwner: 'zg'
       }]));
     }
   }, /*#__PURE__*/React.createElement(IconFont, {

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),
@@ -106,19 +107,26 @@ var CollectionEventList = function CollectionEventList(props) {
       value: -1
     }, {
       label: 'JS',
-      value: 206
+      value: 3
     }, {
       label: 'Android',
-      value: 175
+      value: 1
     }, {
       label: 'IOS',
-      value: 174
+      value: 2
     }, {
       label: '其他',
       value: 99
     }]),
     _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],
@@ -459,7 +467,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 +492,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 +503,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 +540,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 +584,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 +593,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 +632,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 +642,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') {
@@ -403,19 +409,66 @@ var CreateMeta = function CreateMeta(props) {
   // 埋点平台列表
   var _useState19 = useState([{
       label: 'JS',
-      value: 206
+      value: 3
     }, {
       label: 'Android',
-      value: 175
+      value: 1
     }, {
       label: 'IOS',
-      value: 174
+      value: 2
     }, {
       label: '其他',
       value: 99
     }]),
     _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 +538,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/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

@@ -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: number;
+    triggerLabelId: number;
+    triggerLabel: labelData;
+    businessLabel: labelData;
+}
+interface labelData {
+    labelName: string;
+    id: number;
 }
 interface queryPlanType {
     unexpectedPropList: string[];