@zgfe/modules-dm 1.0.56-zhongyuan.8 → 1.0.56-zhongyuan.9

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

@@ -132,13 +132,13 @@ var LeftTree = function LeftTree(props) {
       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)
             });
@@ -245,7 +245,8 @@ var LeftTree = function LeftTree(props) {
       title: 'pageAttrName'
     },
     treeData: treeData,
-    rootClassName: "ziBackground"
+    rootClassName: "ziBackground",
+    height: 430
   }))));
 };
 export default LeftTree;

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

@@ -254,7 +254,7 @@ var RightDetail = function RightDetail(props) {
   }();
   var handleButtonPage = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(flag) {
-      var filterJsonList, obj, xifenList, attrFilterJsonList, modulePageJsonList, _eventNameMap$current, _eventNameMap$current2, _eventNameMap$current3, _eventNameMap$current4, moduleAttrObj, pageAttrObj, _obj, obj1, allFilterObj, resultParams;
+      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:
@@ -288,6 +288,7 @@ var RightDetail = function RightDetail(props) {
                 }
               }
             });
+            // 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) {
@@ -326,17 +327,27 @@ var RightDetail = function RightDetail(props) {
             allFilterObj = {
               relation: 'and',
               conditions: [].concat(_toConsumableArray(filterJsonList), attrFilterJsonList, modulePageJsonList)
-            };
-            console.log(allFilterObj, 'allFilterObj');
+            }; // 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: xifenList,
+                globalDimensions: globalDimensionsList,
                 targets: [{
                   alias: currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventName,
-                  filters: (currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson) && JSON.parse(currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson),
+                  filters: allFilterObj,
                   analysisDimension: {
                     analysisIndex: 'number'
                   },
@@ -355,7 +366,7 @@ var RightDetail = function RightDetail(props) {
                 }
               });
             });
-          case 11:
+          case 12:
           case "end":
             return _context3.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.8",
+  "version": "1.0.56-zhongyuan.9",
   "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": "4167723151cc0471948be5b94234107de9c48281",
+  "gitHead": "98435afd2cf662f61685bf9212467f4fbddcf906",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }