@zgfe/modules-dm 1.0.57-zhongyuan.58 → 1.0.57-zhongyuan.59

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

@@ -12,6 +12,7 @@ interface PropsType {
         event_id: number;
         event_name: string;
         owner?: string;
+        attr_name: string;
     };
     isOpen: number;
     queryPlanData: queryPlanType;

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,6 +29,19 @@ 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),
@@ -71,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;
     }
@@ -608,14 +623,20 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    dataIndex: 'category',
+    // dataIndex: 'category',
     width: 120,
-    render: function render(category) {
-      var json = {
-        fixed: '内置',
-        custom: '自定义'
-      };
-      return /*#__PURE__*/React.createElement("div", null, json[category]);
+    render: function render(record) {
+      // let json: { [x: string]: string } = {
+      //   fixed: '内置',
+      //   custom: '自定义',
+      // };
+      //事件下的属性
+      var eventAttrList = eventWhiteList.includes(eventAttrsData.event_name) ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (j) {
+        return j.attr_name;
+      }) : [];
+      return /*#__PURE__*/React.createElement("div", null, eventAttrList && eventAttrList.length > 0 ? eventAttrList.filter(function (item) {
+        return ownerWhiteListDataList.includes(item);
+      }) ? '内置' : '自定义' : '自定义');
     }
   }, {
     title: '创建人',
@@ -660,14 +681,19 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    dataIndex: 'owner',
+    // dataIndex: 'owner',
     width: 120,
-    render: function render(owner) {
+    render: function render(record) {
       var json = {
         zg_abp: '内置',
         zg: '自定义'
       };
-      return /*#__PURE__*/React.createElement("div", null, json[owner]);
+      var eventAttrList = eventWhiteList.includes(eventAttrsData.event_name) ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (j) {
+        return j.attr_name;
+      }) : [];
+      return /*#__PURE__*/React.createElement("div", null, eventAttrList && eventAttrList.length > 0 ? eventAttrList.filter(function (item) {
+        return ownerWhiteListDataList.includes(item);
+      }) ? '内置' : '自定义' : '自定义');
     }
   }]), [{
     title: '操作',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.58",
+  "version": "1.0.57-zhongyuan.59",
   "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": "9ca8e1917e22d4a5ca402d0564c73e059d3dfc3b",
+  "gitHead": "e655d5290b7a1826c5d740d898dd2454460ae513",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }