@zgfe/modules-settings 2.0.0-zhongyuan.35 → 2.0.0-zhongyuan.36

package/es/constants/api.js

@@ -211,7 +211,7 @@ var apis = {
   // 查询应用埋点控制开关
   getAppAutoEvent: '/zg/web/v2/approve/getAppAutoEvent',
   //埋点日志
-  getEventLog: '/zg/web/v2/approve/getEventLog',
+  getEventLog: '/zg/web/v2/approve/point/event/log',
   // 事件新增
   addEvent: '/zg/web/v2/event/addEvent',
   // menuCode

package/es/modules/createDemand/constants.d.ts

@@ -1,5 +1,5 @@
 import { ColumnsType } from 'antd/es/table/interface';
-declare const columnsEvent: (gotoPage?: Function, isControl?: boolean) => ColumnsType<{
+declare const columnsEvent: (gotoPage?: Function, isControl?: boolean, getPointMap?: Function) => ColumnsType<{
     pageId: number;
 }>;
 declare const demandTabList: ({

package/es/modules/createDemand/constants.js

@@ -8,7 +8,7 @@ import { IconFont } from '@zgfe/business-lib';
 import { Image } from 'antd';
 import React from 'react';
 var classPrefix = 'system-setting-create-demand';
-var columnsEvent = function columnsEvent(gotoPage, isControl) {
+var columnsEvent = function columnsEvent(gotoPage, isControl, getPointMap) {
   return [{
     title: '页面名称',
     dataIndex: 'pageName',
@@ -51,10 +51,10 @@ var columnsEvent = function columnsEvent(gotoPage, isControl) {
     dataIndex: 'eventName',
     width: 153,
     ellipsis: true,
-    render: function render(eventName) {
+    render: function render(eventName, data) {
       return /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
-          return gotoPage && gotoPage('event', eventName);
+          return getPointMap && getPointMap(data);
         }
       }, eventName);
     }

package/es/modules/createDemand/index.js

@@ -35,6 +35,7 @@ import BackConfirm from './backConfirm';
 import constants from '../../utils/constants';
 import { jsPDF } from 'jspdf';
 import domtoimage from 'dom-to-image';
+import CreateMetaDrawer from '../pointMap/createMetaDrawer';
 var getImgUrl = function getImgUrl(src, pageId) {
   return constants.regExp.url.test(src) ? src : "".concat(window.location.origin, "/web/img/report/").concat(pageId, "/").concat(src);
   // return constants.regExp.url.test(src)
@@ -111,7 +112,7 @@ var CreateDemand = function CreateDemand(props) {
     _useState30 = _slicedToArray(_useState29, 2),
     demandData = _useState30[0],
     setDemandData = _useState30[1];
-  var _useState31 = useState(0),
+  var _useState31 = useState(2),
     _useState32 = _slicedToArray(_useState31, 2),
     demandStatus = _useState32[0],
     setDemandStatus = _useState32[1];
@@ -176,6 +177,15 @@ var CreateDemand = function CreateDemand(props) {
     _useState60 = _slicedToArray(_useState59, 2),
     tabIndex = _useState60[0],
     setTabIndex = _useState60[1];
+  //查看埋点内容
+  var _useState61 = useState(false),
+    _useState62 = _slicedToArray(_useState61, 2),
+    createMetaShow = _useState62[0],
+    setCreateMetaShow = _useState62[1];
+  var _useState63 = useState({}),
+    _useState64 = _slicedToArray(_useState63, 2),
+    metaData = _useState64[0],
+    setMetaData = _useState64[1];
   useEffect(function () {
     if (props.demandId) {
       getDemand();
@@ -183,10 +193,10 @@ var CreateDemand = function CreateDemand(props) {
       getNode();
     }
   }, [props.demandId]);
-  var _useState61 = useState(false),
-    _useState62 = _slicedToArray(_useState61, 2),
-    isControl = _useState62[0],
-    setIsControl = _useState62[1];
+  var _useState65 = useState(false),
+    _useState66 = _slicedToArray(_useState65, 2),
+    isControl = _useState66[0],
+    setIsControl = _useState66[1];
   var getAppAutoEvent = function getAppAutoEvent() {
     request(apis.getAppAutoEvent, {
       method: 'post',
@@ -350,7 +360,8 @@ var CreateDemand = function CreateDemand(props) {
         }),
         pointEventStatus: type != 'flow' ? pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
           return item.status;
-        }) : []
+        }) : [],
+        eventList: pointEventInfo
       }, data)
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
@@ -673,7 +684,7 @@ var CreateDemand = function CreateDemand(props) {
   };
   // 新的埋点表格列表
   var newColumns = function newColumns() {
-    var columns = [].concat(_toConsumableArray(columnsEvent(gotoPage, isControl)), [{
+    var columns = [].concat(_toConsumableArray(columnsEvent(gotoPage, isControl, getPointMap)), [{
       title: '状态',
       width: 120,
       dataIndex: 'status',
@@ -887,6 +898,11 @@ var CreateDemand = function CreateDemand(props) {
     })[0];
     return data[key];
   };
+  //查看埋点详情
+  var getPointMap = function getPointMap(data) {
+    setMetaData(data);
+    setCreateMetaShow(true);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -1077,18 +1093,20 @@ var CreateDemand = function CreateDemand(props) {
     className: "button",
     onClick: function onClick() {
       props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
-        setPointEventInfo(val.map(function (val) {
+        console.log(val, 'sbum');
+        setPointEventInfo([].concat(_toConsumableArray(pointEventInfo || []), _toConsumableArray(val.map(function (val) {
           return _objectSpread(_objectSpread({}, val), {}, {
             status: 0
           });
-        }));
+        }))));
         onCreate('save', {
           pointEventIds: val.map(function (res) {
             return res.id;
           }),
           pointEventStatus: val.map(function (res) {
             return 0;
-          })
+          }),
+          eventList: val
         });
       }, pointEventInfo);
     }
@@ -1114,7 +1132,8 @@ var CreateDemand = function CreateDemand(props) {
         }),
         pointEventStatus: list.map(function (res) {
           return res.status;
-        })
+        }),
+        eventList: list
       });
     }
   }, "\u79FB\u9664")), isRead ? null : (demandStatus == 3 || demandStatus == 4) && (/*#__PURE__*/React.createElement(Button, {
@@ -1350,6 +1369,14 @@ var CreateDemand = function CreateDemand(props) {
     },
     showTime: true,
     disabled: isRead
-  })));
+  })), /*#__PURE__*/React.createElement(CreateMetaDrawer, {
+    isShow: createMetaShow,
+    data: metaData,
+    isEdit: false,
+    // selectTreeName={props.selectTreeName}
+    onClose: function onClose() {
+      return setCreateMetaShow(false);
+    }
+  }));
 };
 export default CreateDemand;

package/es/modules/pointMap/createMetaDrawer.js

@@ -441,33 +441,14 @@ var CreateMeta = function CreateMeta(props) {
   var changeSwitch = function changeSwitch(event) {
     setIsCopy(event);
     if (event) {
-      onChangeEvent({
-        alias: '页面滚动',
-        name: 'scroll',
-        clickAnalysis: false,
-        eventHidden: 0,
-        id: 1000448,
-        isDelete: 0,
-        isStop: false,
-        owner: 'zg_abp',
-        attrList: [{
-          alias: '',
-          id: 1001917,
-          eventId: 1000488,
-          label: 'login_id',
-          type: 1,
-          encryptionType: 0
-        }]
-      });
+      onChangeEvent(event);
     }
   };
   var onChangeEvent = function onChangeEvent(event) {
-    console.log(event, 'event');
     form.setFieldsValue({
       aliasName: event.alias,
       eventName: event.name,
-      triggeringOccasion: event.triggeringOccasion,
-      eventId: event.id
+      triggeringOccasion: event.triggeringOccasion
     });
     setInputText(event.name);
     if (event.attrList) {
@@ -478,7 +459,6 @@ var CreateMeta = function CreateMeta(props) {
         });
       })));
     }
-    setIsCopy(false);
   };
   // 自定义验证规则
   var _useState17 = useState(''),

package/es/modules/pointMap/pageInfo.js

@@ -2,15 +2,15 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+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 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 _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 _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 _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; } }
@@ -37,6 +37,7 @@ var getImgUrl = function getImgUrl(src, pageId) {
   //   : `${'https://test01.zhugeapi.com'}/web/img/report/${pageId}/${src}`;
 };
 var PageInfo = function PageInfo(props) {
+  console.log(props, 'props');
   var classPrefix = 'setting-point-map-page';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
@@ -90,51 +91,55 @@ var PageInfo = function PageInfo(props) {
     _useState24 = _slicedToArray(_useState23, 2),
     isEditPicCircle = _useState24[0],
     setIsEditPicCircle = _useState24[1];
-  var _useState25 = useState(props.selectPoint),
+  var _useState25 = useState(props.isSelect ? [] : props.selectPoint),
     _useState26 = _slicedToArray(_useState25, 2),
     selectPoint = _useState26[0],
     setSelectPoint = _useState26[1];
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    isEmpty = _useState28[0],
-    setIsEmpty = _useState28[1];
+  // props.isSelect
+  var _useState27 = useState(props.isSelect),
+    _useState28 = _slicedToArray(_useState27, 1),
+    isSelect = _useState28[0];
   var _useState29 = useState(false),
     _useState30 = _slicedToArray(_useState29, 2),
-    isEdit = _useState30[0],
-    setIsEdit = _useState30[1];
-  var _useState31 = useState(),
+    isEmpty = _useState30[0],
+    setIsEmpty = _useState30[1];
+  var _useState31 = useState(false),
     _useState32 = _slicedToArray(_useState31, 2),
-    imgPath = _useState32[0],
-    setImgPath = _useState32[1];
+    isEdit = _useState32[0],
+    setIsEdit = _useState32[1];
   var _useState33 = useState(),
     _useState34 = _slicedToArray(_useState33, 2),
-    imgUrl = _useState34[0],
-    setImgUrl = _useState34[1];
-  var _useState35 = useState(false),
+    imgPath = _useState34[0],
+    setImgPath = _useState34[1];
+  var _useState35 = useState(),
     _useState36 = _slicedToArray(_useState35, 2),
-    isHasData = _useState36[0],
-    setIsHasData = _useState36[1];
-  // 记录删除的有id的页面埋点
-  var _useState37 = useState([]),
+    imgUrl = _useState36[0],
+    setImgUrl = _useState36[1];
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    deleteEventIds = _useState38[0],
-    setDeleteEventIds = _useState38[1];
-  var _useState39 = useState(''),
+    isHasData = _useState38[0],
+    setIsHasData = _useState38[1];
+  // 记录删除的有id的页面埋点
+  var _useState39 = useState([]),
     _useState40 = _slicedToArray(_useState39, 2),
-    eventKey = _useState40[0],
-    setEventKey = _useState40[1];
-  var _useState41 = useState(),
+    deleteEventIds = _useState40[0],
+    setDeleteEventIds = _useState40[1];
+  var _useState41 = useState(''),
     _useState42 = _slicedToArray(_useState41, 2),
-    id = _useState42[0],
-    setId = _useState42[1];
+    eventKey = _useState42[0],
+    setEventKey = _useState42[1];
   var _useState43 = useState(),
     _useState44 = _slicedToArray(_useState43, 2),
-    showIndex = _useState44[0],
-    setShowIndex = _useState44[1];
-  var _useState45 = useState({}),
+    id = _useState44[0],
+    setId = _useState44[1];
+  var _useState45 = useState(),
     _useState46 = _slicedToArray(_useState45, 2),
-    eventData = _useState46[0],
-    setEventData = _useState46[1];
+    showIndex = _useState46[0],
+    setShowIndex = _useState46[1];
+  var _useState47 = useState({}),
+    _useState48 = _slicedToArray(_useState47, 2),
+    eventData = _useState48[0],
+    setEventData = _useState48[1];
   var changeItemInfo = function changeItemInfo(i, key, v) {
     var dealData = _.clone(eventAttrList);
     dealData[i]['isEdit'] = true;
@@ -142,7 +147,7 @@ var PageInfo = function PageInfo(props) {
     setEventAttrList(dealData);
   };
   //埋点筛选
-  var _useState47 = useState([{
+  var _useState49 = useState([{
       label: '在线埋点',
       sum: 0,
       value: 0
@@ -151,28 +156,28 @@ var PageInfo = function PageInfo(props) {
       sum: 0,
       value: 1
     }]),
-    _useState48 = _slicedToArray(_useState47, 2),
-    navList = _useState48[0],
-    setNavList = _useState48[1];
-  var _useState49 = useState(0),
     _useState50 = _slicedToArray(_useState49, 2),
-    navIndex = _useState50[0],
-    setNavIndex = _useState50[1];
-  //创建元事件
-  var _useState51 = useState(false),
+    navList = _useState50[0],
+    setNavList = _useState50[1];
+  var _useState51 = useState(0),
     _useState52 = _slicedToArray(_useState51, 2),
-    createMetaShow = _useState52[0],
-    setCreateMetaShow = _useState52[1];
-  //元事件内容
-  var _useState53 = useState(),
+    navIndex = _useState52[0],
+    setNavIndex = _useState52[1];
+  //创建元事件
+  var _useState53 = useState(false),
     _useState54 = _slicedToArray(_useState53, 2),
-    metaData = _useState54[0],
-    setMetaData = _useState54[1];
-  //日志管理
-  var _useState55 = useState(false),
+    createMetaShow = _useState54[0],
+    setCreateMetaShow = _useState54[1];
+  //元事件内容
+  var _useState55 = useState(),
     _useState56 = _slicedToArray(_useState55, 2),
-    recordShow = _useState56[0],
-    setRecordShow = _useState56[1];
+    metaData = _useState56[0],
+    setMetaData = _useState56[1];
+  //日志管理
+  var _useState57 = useState(false),
+    _useState58 = _slicedToArray(_useState57, 2),
+    recordShow = _useState58[0],
+    setRecordShow = _useState58[1];
   useEffect(function () {
     // console.log('props.pageData', props.pageData);
     if (!props.pageData) {
@@ -206,39 +211,37 @@ var PageInfo = function PageInfo(props) {
           uuid: res.data.detail.uuid,
           zosFileKey: res.data.detail.zosFileKey
         } : undefined);
-        // getPointTree()
-        setEventAttrList(res.data.eventInfos ? res.data.eventInfos.map(function (item, index) {
-          return {
-            id: item.id,
-            eventId: item.eventId,
-            eventName: item.eventName,
-            describe: item.pointDescribe,
-            pointSelect: item.pointSelect,
-            pv: item.pv,
-            imgPath: item.zosImgUrl ? getImgUrl(item.zosImgUrl, props.pageData.id) : '',
-            key: uuid(),
-            index: index,
-            approvalStatus: item.approvalStatus,
-            operationType: item.operationType,
-            del: item.del || 1
-          };
-        }) : []);
-        //计算出当前上线和下线总合数量
-        // setNavList(
-        //   navList.map((nav) => {
-        //     let sum = 0;
-        //     res.data.eventInfos &&
-        //       res.data.eventInfos.map((item: any, index: number) => {
-        //         if (nav.value == item.del) {
-        //           sum += 1;
-        //         }
-        //       });
-        //     return {
-        //       ...nav,
-        //       sum,
-        //     };
-        //   }),
-        // );
+        if (!isSelect) {
+          // getPointTree()
+          setEventAttrList(res.data.eventInfos ? res.data.eventInfos.map(function (item, index) {
+            return {
+              id: item.id,
+              eventId: item.eventId,
+              eventName: item.eventName,
+              describe: item.pointDescribe,
+              pointSelect: item.pointSelect,
+              pv: item.pv,
+              imgPath: item.zosImgUrl ? getImgUrl(item.zosImgUrl, props.pageData.id) : '',
+              key: uuid(),
+              index: index,
+              approvalStatus: item.approvalStatus,
+              operationType: item.operationType,
+              del: item.del || 1
+            };
+          }) : []);
+          //计算出当前上线和下线总合数量
+          setNavList(navList.map(function (nav) {
+            var sum = 0;
+            res.data.eventInfos && res.data.eventInfos.map(function (item, index) {
+              if (nav.value == item.del) {
+                sum += 1;
+              }
+            });
+            return _objectSpread(_objectSpread({}, nav), {}, {
+              sum: sum
+            });
+          }));
+        }
       }
     }).catch(function (err) {
       console.log(err);
@@ -409,7 +412,7 @@ var PageInfo = function PageInfo(props) {
       return false;
     } else {
       return !!selectPoint.filter(function (item) {
-        return item.id === record.id;
+        return isSelect ? item.eventName === record.eventName : item.id === record.id;
       }).length;
     }
   };
@@ -463,15 +466,15 @@ var PageInfo = function PageInfo(props) {
     props.onChangeSelectObj && props.onChangeSelectObj(_selectPoint);
   };
   // 表格列表筛选项
-  var _useState57 = useState(0),
-    _useState58 = _slicedToArray(_useState57, 2),
-    type = _useState58[0],
-    setType = _useState58[1];
-  var _useState59 = useState(-1),
+  var _useState59 = useState(0),
     _useState60 = _slicedToArray(_useState59, 2),
-    encryption_type = _useState60[0],
-    setEncryptionType = _useState60[1];
-  var columns = [].concat(_toConsumableArray(props.isSelect && !isEdit ? [{
+    type = _useState60[0],
+    setType = _useState60[1];
+  var _useState61 = useState(-1),
+    _useState62 = _slicedToArray(_useState61, 2),
+    encryption_type = _useState62[0],
+    setEncryptionType = _useState62[1];
+  var columns = [].concat(_toConsumableArray(!isEdit ? [{
     title: (/*#__PURE__*/React.createElement(Checkbox, {
       checked: checkedAllHandle(),
       onChange: function onChange(e) {
@@ -518,21 +521,24 @@ var PageInfo = function PageInfo(props) {
         placement: "topLeft"
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
-          if (isEdit) {
-            props.setIsShowSelectList && props.setIsShowSelectList(function (data) {
-              var item = data.selectEventList[0];
-              changeItemInfo(index, 'eventId', item && item.event_id ? item.event_id : undefined);
-              changeItemInfo(index, 'eventName', item && item.event_id ? item.event_name : undefined);
-              changeItemInfo(index, 'approvalStatus', item && item.event_id ? item.approvalStatus : undefined);
-              changeItemInfo(index, 'operationType', item && item.event_id ? item.operationType : undefined);
-              changeItemInfo(index, 'pv');
-            }, record);
+          if (!isSelect) {
+            if (isEdit) {
+              props.setIsShowSelectList && props.setIsShowSelectList(function (data) {
+                var item = data.selectEventList[0];
+                changeItemInfo(index, 'eventId', item && item.event_id ? item.event_id : undefined);
+                changeItemInfo(index, 'eventName', item && item.event_id ? item.event_name : undefined);
+                changeItemInfo(index, 'approvalStatus', item && item.event_id ? item.approvalStatus : undefined);
+                changeItemInfo(index, 'operationType', item && item.event_id ? item.operationType : undefined);
+                changeItemInfo(index, 'pv');
+              }, record);
+            } else {
+              window.open('/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage?key=' + eventName, '_blank');
+            }
           } else {
-            window.open('/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage?key=' + eventName, '_blank');
+            //打开元事件
+            setCreateMetaShow(true);
+            setMetaData(record);
           }
-          //打开元事件
-          // setCreateMetaShow(true);
-          // setMetaData(record);
         }
       }, eventName ? eventName : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
         type: "zhuanfa",
@@ -572,9 +578,9 @@ var PageInfo = function PageInfo(props) {
     ellipsis: true,
     width: 198,
     render: function render(describe, record, index) {
-      if (isEdit) {
+      if (isEdit || isSelect) {
         return /*#__PURE__*/React.createElement(BizEditText, {
-          canEdit: isEdit,
+          canEdit: isEdit || isSelect,
           value: describe,
           max: 20,
           isHideIcon: true,
@@ -608,7 +614,7 @@ var PageInfo = function PageInfo(props) {
         }
       })) : (/*#__PURE__*/React.createElement(IconFont, {
         type: "tianjiatupian"
-      })), isEdit && (/*#__PURE__*/React.createElement("div", {
+      })), (isEdit || isSelect) && (/*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-img-select-btn"),
         onClick: function onClick() {
           if (!imgPath) {
@@ -639,7 +645,7 @@ var PageInfo = function PageInfo(props) {
       title: '昨日',
       dataIndex: 'time1',
       key: 'time1',
-      width: 92,
+      width: 80,
       render: function render(value) {
         return /*#__PURE__*/React.createElement("div", {
           className: "".concat(classPrefix, "-content-select")
@@ -649,7 +655,7 @@ var PageInfo = function PageInfo(props) {
       title: '近7天',
       dataIndex: 'time1',
       key: 'time1',
-      width: 92,
+      width: 80,
       render: function render(value) {
         return /*#__PURE__*/React.createElement("div", {
           className: "".concat(classPrefix, "-content-select")
@@ -659,14 +665,14 @@ var PageInfo = function PageInfo(props) {
       title: '近30天',
       dataIndex: 'time1',
       key: 'time1',
-      width: 92,
+      width: 80,
       render: function render(value) {
         return /*#__PURE__*/React.createElement("div", {
           className: "".concat(classPrefix, "-content-select")
         }, value || value === 0 ? value : '-');
       }
     }]
-  }], _toConsumableArray(isEdit ? [{
+  }], _toConsumableArray(isEdit || isSelect ? [{
     title: '操作',
     dataIndex: 'set',
     key: 'set',
@@ -694,10 +700,10 @@ var PageInfo = function PageInfo(props) {
     }
   }]));
   var DealDom = function DealDom(props) {
-    var _useState61 = useState(false),
-      _useState62 = _slicedToArray(_useState61, 2),
-      open = _useState62[0],
-      setOpen = _useState62[1];
+    var _useState63 = useState(false),
+      _useState64 = _slicedToArray(_useState63, 2),
+      open = _useState64[0],
+      setOpen = _useState64[1];
     var handleOpenChange = function handleOpenChange(newOpen) {
       setOpen(newOpen);
     };
@@ -744,10 +750,10 @@ var PageInfo = function PageInfo(props) {
       }
     }, "\u79FB\u9664"));
   };
-  var _useState63 = useState(''),
-    _useState64 = _slicedToArray(_useState63, 2),
-    scrollY = _useState64[0],
-    setScrollY = _useState64[1];
+  var _useState65 = useState(''),
+    _useState66 = _slicedToArray(_useState65, 2),
+    scrollY = _useState66[0],
+    setScrollY = _useState66[1];
   //页面加载完成后才能获取到对应的元素及其位置
   var onClose = function onClose() {
     if (isChange) {
@@ -851,28 +857,30 @@ var PageInfo = function PageInfo(props) {
   };
   var addNewEvent = function addNewEvent() {
     //新埋点管理
-    // setMetaData(undefined);
-    // setCreateMetaShow(true);
-    //老埋点
-    setEventAttrList([{
-      eventId: void 0,
-      eventName: '',
-      describe: '',
-      pointSelect: '',
-      imgPath: '',
-      index: eventAttrList.length,
-      key: new Date() * 1
-    }].concat(_toConsumableArray(eventAttrList)));
-    setShowIndex(eventAttrList.length);
-    setTimeout(function () {
-      setShowIndex(void 0);
-    }, 3000);
+    if (isSelect) {
+      setMetaData(undefined);
+      setCreateMetaShow(true);
+    } else {
+      //老埋点
+      setEventAttrList([{
+        eventId: void 0,
+        eventName: '',
+        describe: '',
+        pointSelect: '',
+        imgPath: '',
+        index: eventAttrList.length,
+        key: new Date() * 1
+      }].concat(_toConsumableArray(eventAttrList)));
+      setShowIndex(eventAttrList.length);
+      setTimeout(function () {
+        setShowIndex(void 0);
+      }, 3000);
+    }
   };
   //设置新添加的元事件
   var onEventSet = function onEventSet(data, type) {
     if (type == 'create') {
       setEventAttrList([{
-        eventId: data.eventId,
         eventName: data.eventName,
         triggeringOccasion: data.triggeringOccasion,
         aliasName: data.aliasName,
@@ -927,7 +935,7 @@ var PageInfo = function PageInfo(props) {
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     type: 'primary',
     onClick: submit
-  }, "\u786E\u5B9A"))) : props.pageData && props.pageData.currentPointVersion !== '全部' ? null : (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+  }, "\u786E\u5B9A"))) : props.pageData && props.pageData.currentPointVersion !== '全部' ? null : (/*#__PURE__*/React.createElement("div", null, !isSelect && (/*#__PURE__*/React.createElement(Button, {
     disabled: !authority[1724922835],
     shape: "round",
     className: "button bianji1-button",
@@ -939,7 +947,7 @@ var PageInfo = function PageInfo(props) {
     style: {
       marginRight: 8
     }
-  }), "\u7F16\u8F91")))), /*#__PURE__*/React.createElement("div", {
+  }), "\u7F16\u8F91"))))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info")
@@ -1056,8 +1064,7 @@ var PageInfo = function PageInfo(props) {
       return setEventKey(e.target.value);
     },
     placeholder: '请输入埋点事件名称搜索'
-  }), isEdit && (/*#__PURE__*/React.createElement(Button, {
-    disabled: !isEdit,
+  }), (isEdit || isSelect) && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "button",
     onClick: addNewEvent
@@ -1066,7 +1073,18 @@ var PageInfo = function PageInfo(props) {
     style: {
       marginRight: 8
     }
-  }), "\u6DFB\u52A0\u9875\u9762\u57CB\u70B9")))), /*#__PURE__*/React.createElement(Table, {
+  }), "\u6DFB\u52A0\u9875\u9762\u57CB\u70B9")))), !isSelect && !isEdit && (/*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-info")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-info-nav")
+  }, navList.map(function (res) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-info-nav-item  ").concat(navIndex == res.value ? "".concat(classPrefix, "-info-nav-itemActive") : ''),
+      onClick: function onClick() {
+        setNavIndex(res.value);
+      }
+    }, res.label, ": ", res.sum);
+  })))), /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     rowClassName: function rowClassName(record) {
       return record.index === showIndex ? 'isShowF2F3F4' : '';
@@ -1076,6 +1094,12 @@ var PageInfo = function PageInfo(props) {
     rowKey: 'uuid',
     dataSource: (eventAttrList || []).filter(function (item) {
       return new RegExp(_.escapeRegExp(eventKey), 'i').test(item.eventName || '');
+    }).filter(function (res) {
+      if (isEdit || isSelect) {
+        return true;
+      } else {
+        return res.del == navIndex;
+      }
     }),
     scroll: {
       y: window.innerHeight - 380
@@ -1120,7 +1144,7 @@ var PageInfo = function PageInfo(props) {
     onChange: setCircleImg
   }))), /*#__PURE__*/React.createElement(Drawer, {
     className: "".concat(classPrefix, "-drawer"),
-    width: '60%',
+    width: '65%',
     title: /*#__PURE__*/React.createElement("div", null, "\u57CB\u70B9\u65E5\u5FD7"),
     placement: "right",
     destroyOnClose: true,
@@ -1129,12 +1153,12 @@ var PageInfo = function PageInfo(props) {
     },
     open: recordShow
   }, /*#__PURE__*/React.createElement(RecordDom, {
-    eventId: eventData.eventId,
+    id: eventData.id,
     eventName: eventData.eventName
   })), /*#__PURE__*/React.createElement(CreateMetaDrawer, {
     isShow: createMetaShow,
     data: metaData,
-    isEdit: isEdit,
+    isEdit: true,
     onSubmit: function onSubmit(event, type) {
       setCreateMetaShow(false);
       onEventSet(event, type);

package/es/modules/pointMap/record.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import './styles/pageInfo.less';
 declare const record: React.FC<{
-    eventId: number | string;
+    id: number | string;
     eventName: string;
 }>;
 export default record;

package/es/modules/pointMap/record.js

@@ -304,14 +304,14 @@ var record = function record(props) {
   };
   useEffect(function () {
     getEventLog();
-  }, [props.eventId]);
+  }, [props.id]);
   //埋点日志查询
   var getEventLog = function getEventLog() {
     request(apis.getEventLog, {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        id: props.eventId
+        pointId: props.id
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
@@ -336,7 +336,7 @@ var record = function record(props) {
           var list = [];
           res.data.map(function (item) {
             if (nameItem.name == item.logDesc) {
-              if (nameItem.name == '属性修改') {
+              if (nameItem.name !== '属性修改') {
                 var valueList = [];
                 for (var key in item.logDetail) {
                   valueList.push({
@@ -442,7 +442,7 @@ var record = function record(props) {
       className: "".concat(classPrefix, "-record-content-timeList-nav-icon"),
       style: {
         backgroundColor: res.iconColor,
-        outlineColor: res.iconColor + '50'
+        boxShadow: '0 0 0 5px' + res.iconColor + '50'
       }
     }), /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-record-content-timeList-nav-name")

package/es/modules/pointMap/styles/pageInfo.less

@@ -304,7 +304,6 @@
           height: 10px;
           margin-right: 20px;
           border-radius: 50%;
-          outline: 5px solid;
         }
         &-name {
           color: #5f6085;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.35",
+  "version": "2.0.0-zhongyuan.36",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "63f753385d56c4f15605827533a25a20765830fa",
+  "gitHead": "5e361528e645345f4fde79ebfc08448990f4bf65",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }