@zgfe/modules-dm 1.0.56-zhongyuan.12 → 1.0.56-zhongyuan.13

package/es/modules/CutsModal.d.ts

@@ -64,3 +64,20 @@ export interface FiltersType {
     label: string;
     attrName: string;
 }
+export interface mapFilterType {
+    mapId: number;
+}
+export interface andFilterConditionsType {
+    attrId: number;
+    propCategory: string;
+    type: number;
+    operator: string;
+    values: any;
+    dimensionSub: string;
+    label: string;
+    attrName: string;
+}
+export interface andFilterType {
+    relation: string;
+    conditions: andFilterConditionsType[];
+}

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

@@ -28,7 +28,6 @@ import { getAppID, getTableScroll } from '../../../utils';
 import { DmContext } from '../../../store';
 var Text = Typography.Text;
 var TablePlus = function TablePlus(props) {
-  console.log(props, 'kkk');
   var classPrefix = 'table-plus';
   var tableHandleData = props.tableHandleData,
     queryPlanData = props.queryPlanData,

package/es/modules/dataManage/demo/index.js

@@ -80,11 +80,10 @@ export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(DataManage
   // isSelect={true}
   // isSelectTab={'1'}
-  // selectTreeName="新页面_点击"
   , {
     // isSelect={true}
     // isSelectTab={'1'}
-    // selectTreeName="新页面_点击"
+    selectTreeName: "\u65B0\u9875\u9762_\u70B9\u51FB",
     onChangeSelectObj: setSelectObj,
     selectObj: selectObj
   }));

package/es/modules/dataMap/component/leftTree.d.ts

@@ -2,5 +2,6 @@ import React from 'react';
 declare const LeftTree: React.FC<{
     onChangeTree: Function;
     onCurrentMap?: Function;
+    onFilterValue?: Function;
 }>;
 export default LeftTree;

package/es/modules/dataMap/component/leftTree.js

@@ -45,7 +45,12 @@ var LeftTree = function LeftTree(props) {
     var newArr = mapData === null || mapData === void 0 ? void 0 : mapData.filter(function (o) {
       return o.id == value;
     })[0];
-    setCurrentMap(newArr);
+    setCurrentMap(function () {
+      getTreeList({
+        mapId: newArr.id
+      });
+      return newArr;
+    });
     // 地图下的搜索条件
     setFilterMapListLabel((newArr === null || newArr === void 0 ? void 0 : newArr.attributeJson) ? JSON.parse(newArr === null || newArr === void 0 ? void 0 : newArr.attributeJson) : []);
     // 搜索条件重置
@@ -76,10 +81,19 @@ var LeftTree = function LeftTree(props) {
                 values[o] = values[o].join();
               }
             });
-            setSearchData(_objectSpread(_objectSpread({}, values), {}, {
-              mapId: currentMap === null || currentMap === void 0 ? void 0 : currentMap.id
-            }));
-            getTreeList();
+            setSearchData(function () {
+              getTreeList(_objectSpread(_objectSpread({}, values), {}, {
+                mapId: currentMap === null || currentMap === void 0 ? void 0 : currentMap.id
+              }));
+              return _objectSpread(_objectSpread({}, values), {}, {
+                mapId: currentMap === null || currentMap === void 0 ? void 0 : currentMap.id
+              });
+            });
+            setTimeout(function () {
+              (props === null || props === void 0 ? void 0 : props.onFilterValue) && (props === null || props === void 0 ? void 0 : props.onFilterValue(_objectSpread(_objectSpread({}, values), {}, {
+                mapId: currentMap === null || currentMap === void 0 ? void 0 : currentMap.id
+              })));
+            }, 0);
           case 6:
           case "end":
             return _context.stop();
@@ -107,23 +121,24 @@ var LeftTree = function LeftTree(props) {
     getTreeList();
   }, []);
   var getTreeList = function getTreeList() {
+    var searchJson = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : search;
     setLoadingSearch(true);
     request(apis.dataMap.getTreeList, {
       method: 'post',
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }, search)
+      }, searchJson)
     }).then(function (res) {
       var _newArr$, _newArr$$children;
       setLoadingSearch(false);
       if (!res) return;
-      console.log(res.data);
       var newArr = [];
       (res === null || res === void 0 ? void 0 : res.data) && Object.keys(res === null || res === void 0 ? void 0 : res.data).forEach(function (o, fatherIndex) {
+        var _res$data;
         var obj = {
           pageAttrName: o,
           key: "".concat(o, "-").concat(fatherIndex),
-          children: res.data[o].map(function (v, index) {
+          children: (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data[o].map(function (v, index) {
             return _objectSpread(_objectSpread({}, v), {}, {
               key: "".concat(o, "-").concat(fatherIndex, "-").concat(index)
             });
@@ -147,7 +162,14 @@ var LeftTree = function LeftTree(props) {
     var currentTreeData = info.node.children ? info.node.children[0] : info.node;
     setCurrentTree(currentTreeData);
   };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form, {
+  var treeHeight = function treeHeight() {
+    return filterMapListLabel.length > 0 ? 430 - 58 * (filterMapListLabel.length - 1) : 430;
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(pageClassName)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(pageClassName, "-top")
+  }, /*#__PURE__*/React.createElement(Form, {
     name: "basic",
     form: viewForm,
     labelAlign: "left",
@@ -165,8 +187,7 @@ var LeftTree = function LeftTree(props) {
       },
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
-    }), "\u57CB\u70B9\u5730\u56FE"),
-    name: "map"
+    }), "\u57CB\u70B9\u5730\u56FE")
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     placeholder: "\u8BF7\u9009\u62E9\u5730\u56FE",
     allowClear: true,
@@ -199,7 +220,9 @@ var LeftTree = function LeftTree(props) {
   })), /*#__PURE__*/React.createElement("button", {
     className: "".concat(pageClassName, "_searchBtn"),
     onClick: handleModelList
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Divider, null), (treeData === null || treeData === void 0 ? void 0 : treeData.length) == 0 && !loadingSearch && /*#__PURE__*/React.createElement(Empty, {
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Divider, null)), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(pageClassName, "-tree")
+  }, (treeData === null || treeData === void 0 ? void 0 : treeData.length) == 0 && !loadingSearch && /*#__PURE__*/React.createElement(Empty, {
     style: {
       margin: '70px 8px 0px'
     }
@@ -226,7 +249,7 @@ var LeftTree = function LeftTree(props) {
     },
     treeData: treeData,
     rootClassName: "ziBackground",
-    height: 363
-  })));
+    height: treeHeight()
+  }))));
 };
 export default LeftTree;

package/es/modules/dataMap/component/rightDetail.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-import { mapDataType } from '../../CutsModal';
+import { mapDataType, mapFilterType } from '../../CutsModal';
 declare const RightDetail: React.FC<{
     currentTreeData: any;
     currentMap?: mapDataType;
+    filterValue?: mapFilterType;
 }>;
 export default RightDetail;

package/es/modules/dataMap/component/rightDetail.js

@@ -1,4 +1,13 @@
 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 _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 _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); }); }; }
@@ -9,7 +18,7 @@ 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 { Card, Form, Input, Upload, message, Table, Button, Space, Empty, Spin } from 'antd';
-import { LoadingOutlined, PlusOutlined, ProjectTwoTone, FundTwoTone, ControlTwoTone, SlidersTwoTone } from '@ant-design/icons';
+import { LoadingOutlined, PlusOutlined, SlidersTwoTone } from '@ant-design/icons';
 import React, { useState, useContext, useEffect } from 'react';
 import { IconFont, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 import apis from '../../../constants/api';
@@ -17,6 +26,7 @@ import request from '../../../utils/ajax';
 import { guid } from '../../../utils/index';
 import moment from 'moment';
 import { getImgUrl } from '../../CutsModal';
+import { toNumber } from 'lodash';
 var TextArea = Input.TextArea;
 var pageName = 'dataMapDetail';
 var getBase64 = function getBase64(img, callback) {
@@ -55,38 +65,6 @@ var RightDetail = function RightDetail(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     currentTreeDetail = _useState10[0],
     setCurrentTreeDetail = _useState10[1];
-  // 点击事件分析的事件和属性
-  var buttonAnalyze = {
-    name: '$WebClick',
-    attrs: {
-      page: 'event_attr',
-      filters: ['current_version', 'app_name', 'func_module', 'func_module_id', 'func_module_ver', 'page_name']
-    }
-  };
-  // 页面浏览详情分析
-  var pageAnalyze = {
-    name: '$pageview',
-    attrs: {
-      page: 'page_name',
-      filters: ['current_version', 'app_name', 'app_version', 'func_module', 'func_module_id', 'func_module_ver']
-    }
-  };
-  // 页面实验浏览分析
-  var pagePractice = {
-    name: '$pageview',
-    attrs: {
-      page: 'page_name',
-      filters: ['current_version', 'app_name', 'app_version', 'func_module', 'func_module_id', 'func_module_ver']
-    }
-  };
-  // 页面点击浏览分析
-  var pageClick = {
-    name: '$AppClick',
-    attrs: {
-      page: 'button_name',
-      filters: ['current_version', 'app_name ', 'current_version', 'func_module', 'func_module_id', 'func_module_ver', 'page_name']
-    }
-  };
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
     isEdit = _useState12[0],
@@ -276,64 +254,111 @@ var RightDetail = function RightDetail(props) {
   }();
   var handleButtonPage = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(flag) {
-      var currentObj, flagEventName;
+      var filterJsonList, obj, xifenList, attrFilterJsonList, modulePageJsonList, _eventNameMap$current, _eventNameMap$current2, _eventNameMap$current3, _eventNameMap$current4, moduleAttrObj, pageAttrObj, _obj, obj1, allFilterObj, globalDimensionsList, resultParams;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            // 'buttonAnalyzeParams' // 按钮点击事件
-            // 'pageAnalyzeParams' // 页面浏览详情事件
-            // 'pagePracticeParams' // 页面实践浏览分析
-            // "pageClickParams" // 页面点击实验分析
-            currentObj = null;
-            flagEventName = '';
-            if (!(flag == 'buttonAnalyzeParams')) {
-              _context3.next = 7;
-              break;
-            }
-            _context3.next = 5;
-            return getPageView(buttonAnalyze);
-          case 5:
-            currentObj = _context3.sent;
-            flagEventName = buttonAnalyze.name;
-          case 7:
-            if (!(flag == 'pageAnalyzeParams')) {
-              _context3.next = 12;
-              break;
-            }
-            _context3.next = 10;
-            return getPageView(pageAnalyze);
-          case 10:
-            currentObj = _context3.sent;
-            flagEventName = pageAnalyze.name;
-          case 12:
-            if (!(flag == 'pagePracticeParams')) {
-              _context3.next = 17;
-              break;
-            }
-            _context3.next = 15;
-            return getPageView(pagePractice);
-          case 15:
-            currentObj = _context3.sent;
-            flagEventName = pagePractice.name;
-          case 17:
-            if (!(flag == 'pageClickParams')) {
-              _context3.next = 22;
-              break;
-            }
-            _context3.next = 20;
-            return getPageView(pageClick);
-          case 20:
-            currentObj = _context3.sent;
-            flagEventName = pageClick.name;
-          case 22:
-            if (currentObj) {
-              _context3.next = 25;
-              break;
+            // console.log(
+            //   currentMap,
+            //   currentTreeData,
+            //   props.filterValue,
+            //   JSON.parse(currentMap?.filterJson),
+            //   JSON.parse(currentMap?.attributeJson),
+            //   eventNameMap,
+            // );
+            filterJsonList = (currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson) ? JSON.parse(currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson).conditions : []; // 搜索的值 细分的值
+            obj = _objectSpread({}, props.filterValue); // 查询是的值
+            xifenList = (currentMap === null || currentMap === void 0 ? void 0 : currentMap.attributeJson) && JSON.parse(currentMap === null || currentMap === void 0 ? void 0 : currentMap.attributeJson);
+            attrFilterJsonList = [];
+            Object.keys(obj).forEach(function (o) {
+              if (o != 'mapId') {
+                if (obj[o]) {
+                  var indexNum = toNumber(o.substr(o.length - 1, 1));
+                  attrFilterJsonList.push({
+                    attrId: xifenList[indexNum - 1].inquire.id,
+                    attrName: xifenList[indexNum - 1].inquire.label,
+                    dimensionSub: xifenList[indexNum - 1].inquire.dimensionSub,
+                    label: xifenList[indexNum - 1].inquire.label,
+                    operator: 'equal',
+                    propCategory: 'eventProp',
+                    type: xifenList[indexNum - 1].inquire.type,
+                    values: [obj[o]]
+                  });
+                  console.log(attrFilterJsonList, indexNum);
+                }
+              }
+            });
+            // page module 的值拼接
+            modulePageJsonList = [];
+            if (eventNameMap && (currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName)) {
+              moduleAttrObj = (_eventNameMap$current = eventNameMap[currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName]) === null || _eventNameMap$current === void 0 ? void 0 : (_eventNameMap$current2 = _eventNameMap$current.attrList.filter(function (o) {
+                return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName);
+              })) === null || _eventNameMap$current2 === void 0 ? void 0 : _eventNameMap$current2[0];
+              pageAttrObj = (_eventNameMap$current3 = eventNameMap[currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName]) === null || _eventNameMap$current3 === void 0 ? void 0 : (_eventNameMap$current4 = _eventNameMap$current3.attrList.filter(function (o) {
+                return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.pageAttrName);
+              })) === null || _eventNameMap$current4 === void 0 ? void 0 : _eventNameMap$current4[0];
+              if (moduleAttrObj) {
+                _obj = {
+                  attrId: moduleAttrObj.id,
+                  attrName: moduleAttrObj.label,
+                  dimensionSub: moduleAttrObj.dimensionSub,
+                  label: moduleAttrObj.label,
+                  operator: 'equal',
+                  propCategory: 'eventProp',
+                  type: moduleAttrObj.type,
+                  values: moduleAttrObj === null || moduleAttrObj === void 0 ? void 0 : moduleAttrObj.values
+                };
+                modulePageJsonList.push(_obj);
+              }
+              if (pageAttrObj) {
+                obj1 = {
+                  attrId: pageAttrObj.id,
+                  attrName: pageAttrObj.label,
+                  dimensionSub: pageAttrObj.dimensionSub,
+                  label: pageAttrObj.label,
+                  operator: 'equal',
+                  propCategory: 'eventProp',
+                  type: pageAttrObj.type,
+                  values: pageAttrObj === null || pageAttrObj === void 0 ? void 0 : pageAttrObj.values
+                };
+                modulePageJsonList.push(obj1);
+              }
             }
-            message.warning("\u5F53\u524D\u6CA1\u6709\u8FD9\u4E2A\u4E8B\u4EF6----".concat(flagEventName));
-            return _context3.abrupt("return");
-          case 25:
-            getShortKey(JSON.stringify(currentObj)).then(function (key) {
+            allFilterObj = {
+              relation: 'and',
+              conditions: [].concat(_toConsumableArray(filterJsonList), attrFilterJsonList, modulePageJsonList)
+            }; // console.log(allFilterObj, 'allFilterObj');
+            // 细分的 属性值
+            globalDimensionsList = [];
+            xifenList.forEach(function (o) {
+              var obj = {
+                propCategory: o.inquire.propCategory,
+                type: o.inquire.type,
+                attrId: o.inquire.id,
+                attrName: o.inquire.label
+              };
+              globalDimensionsList.push(obj);
+            });
+            resultParams = {
+              data: {
+                chartType: 'line',
+                module: 'insight',
+                userGroup: [0],
+                globalDimensions: globalDimensionsList,
+                targets: [{
+                  alias: currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName,
+                  filters: allFilterObj,
+                  analysisDimension: {
+                    analysisIndex: 'number'
+                  },
+                  eventGroupId: 0,
+                  eventId: currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventId,
+                  eventName: currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName,
+                  type: 'event'
+                }]
+              }
+            };
+            getShortKey(JSON.stringify(resultParams)).then(function (key) {
               router === null || router === void 0 ? void 0 : router.push({
                 name: routes.insight,
                 query: {
@@ -341,7 +366,7 @@ var RightDetail = function RightDetail(props) {
                 }
               });
             });
-          case 26:
+          case 12:
           case "end":
             return _context3.stop();
         }
@@ -365,7 +390,7 @@ var RightDetail = function RightDetail(props) {
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            // console.log(currentTreeData, currentMap, eventGroupList, 'currentTreeData');
+            // console.log(currentTreeData, currentMap, eventGroupList,eventNameMap, 'currentTreeData');
             haveEventName = eventNameMap === null || eventNameMap === void 0 ? void 0 : eventNameMap[currentTreeData.eventName]; // 查找事件
             haveModuleAttr = haveEventName === null || haveEventName === void 0 ? void 0 : haveEventName.attrList.find(function (o) {
               return o.label == (currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName);
@@ -400,7 +425,7 @@ var RightDetail = function RightDetail(props) {
               propCategory: 'eventProp',
               type: 1,
               operator: 'equal',
-              values: havePageAttr.values,
+              values: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.values,
               dimensionSub: 'event_attr',
               label: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.label,
               attrName: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.label
@@ -636,57 +661,6 @@ var RightDetail = function RightDetail(props) {
     onClick: function onClick() {
       return handleButtonPage('buttonAnalyzeParams');
     }
-  }, "\u67E5\u770B")), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_left")
-  }, /*#__PURE__*/React.createElement(ControlTwoTone, {
-    style: {
-      fontSize: '20px'
-    },
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_leftText")
-  }, "\u9875\u9762\u6D4F\u89C8\u8BE6\u60C5\u5206\u6790")), /*#__PURE__*/React.createElement("a", {
-    className: "".concat(pageName, "_echartDiv_view"),
-    onClick: function onClick() {
-      return handleButtonPage('pageAnalyzeParams');
-    }
-  }, "\u67E5\u770B")), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_left")
-  }, /*#__PURE__*/React.createElement(FundTwoTone, {
-    style: {
-      fontSize: '20px'
-    },
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_leftText")
-  }, "\u9875\u9762\u5B9E\u8DF5\u6D4F\u89C8\u5206\u6790")), /*#__PURE__*/React.createElement("a", {
-    className: "".concat(pageName, "_echartDiv_view"),
-    onClick: function onClick() {
-      return handleButtonPage('pagePracticeParams');
-    }
-  }, "\u67E5\u770B")), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_left")
-  }, /*#__PURE__*/React.createElement(ProjectTwoTone, {
-    style: {
-      fontSize: '20px'
-    },
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(pageName, "_echartDiv_leftText")
-  }, "\u9875\u9762\u70B9\u51FB\u5B9E\u9A8C\u5206\u6790")), /*#__PURE__*/React.createElement("a", {
-    className: "".concat(pageName, "_echartDiv_view"),
-    onClick: function onClick() {
-      return handleButtonPage('pageClickParams');
-    }
   }, "\u67E5\u770B"))))))) : (/*#__PURE__*/React.createElement(Empty, {
     image: Empty.PRESENTED_IMAGE_SIMPLE
   })));

package/es/modules/dataMap/component/rightDetail1.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { mapDataType } from '../../CutsModal';
+declare const RightDetail: React.FC<{
+    currentTreeData: any;
+    currentMap?: mapDataType;
+}>;
+export default RightDetail;