@zgfe/modules-dm 1.0.57-zhongyuan.70 → 1.0.57-zhongyuan.72

package/es/modules/dataManage/collectionEventList.js

@@ -114,9 +114,17 @@ var CollectionEventList = function CollectionEventList(props) {
     }, {
       label: 'IOS',
       value: 2
+    },
+    // { label: '其他', value: 99 },
+    {
+      label: '微信小程序',
+      value: 4
+    }, {
+      label: '服务端',
+      value: 5
     }, {
-      label: '其他',
-      value: 99
+      label: '鸿蒙',
+      value: 6
     }]),
     _useState28 = _slicedToArray(_useState27, 1),
     maidianList = _useState28[0];

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

@@ -416,9 +416,17 @@ var CreateMeta = function CreateMeta(props) {
     }, {
       label: 'IOS',
       value: 2
+    },
+    // { label: '其他', value: 99 },
+    {
+      label: '微信小程序',
+      value: 4
+    }, {
+      label: '服务端',
+      value: 5
     }, {
-      label: '其他',
-      value: 99
+      label: '鸿蒙',
+      value: 6
     }]),
     _useState20 = _slicedToArray(_useState19, 1),
     maidianList = _useState20[0];

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

@@ -504,8 +504,14 @@ var TablePlus = function TablePlus(props) {
       label: 'IOS',
       value: 2
     }, {
-      label: '其他',
-      value: '99'
+      label: '微信小程序',
+      value: 4
+    }, {
+      label: '服务端',
+      value: 5
+    }, {
+      label: '鸿蒙',
+      value: 6
     }]),
     _useState30 = _slicedToArray(_useState29, 1),
     maidianList = _useState30[0];
@@ -854,16 +860,16 @@ var TablePlus = function TablePlus(props) {
         return /*#__PURE__*/React.createElement(Tag, {
           key: index
         }, (_maidianList$filter$ = maidianList.filter(function (obj) {
-          return obj.value == item;
+          return obj.value + '' == item;
         })[0]) === null || _maidianList$filter$ === void 0 ? void 0 : _maidianList$filter$.label);
-      }), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
+      }), /*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
           setIsMaidianModal(true);
           text && setCurrentMaidian(text.split(','));
           setCurrentRow(record);
         }
-      })));
+      }));
     }
   }, {
     title: '末次上报时间',

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

@@ -407,7 +407,7 @@ var RightDetail = function RightDetail(props) {
   }, [currentTreeData]);
   var xunapi = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var haveEventName, attrListApi, haveModuleAttr, havePageAttr, objConditions, b1, b7, b30;
+      var haveEventName, attrListApi, haveModuleAttr, havePageAttr, obj, xifenList, attrFilterJsonList, objConditions, b1, b7, b30;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -437,6 +437,27 @@ var RightDetail = function RightDetail(props) {
             message.warning("".concat(currentMap === null || currentMap === void 0 ? void 0 : currentMap.moduleAttrName, "\u4E0B\u7684").concat(currentMap === null || currentMap === void 0 ? void 0 : currentMap.pageAttrName, "\u6CA1\u6709"));
             return _context4.abrupt("return");
           case 11:
+            // 搜索的值 细分的值
+            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]]
+                  });
+                }
+              }
+            });
             objConditions = [{
               attrId: haveModuleAttr === null || haveModuleAttr === void 0 ? void 0 : haveModuleAttr.id,
               propCategory: 'eventProp',
@@ -455,19 +476,19 @@ var RightDetail = function RightDetail(props) {
               dimensionSub: 'event_attr',
               label: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.label,
               attrName: havePageAttr === null || havePageAttr === void 0 ? void 0 : havePageAttr.label
-            }]; // console.log(objConditions, 'kkk');
+            }].concat(attrFilterJsonList); // console.log(objConditions, 'kkk');
             setInterviewLoading(true);
-            _context4.next = 15;
+            _context4.next = 19;
             return dayValues(objConditions, moment().subtract(1, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), [1, 0]);
-          case 15:
+          case 19:
             b1 = _context4.sent;
-            _context4.next = 18;
+            _context4.next = 22;
             return dayValues(objConditions, moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), [7, 0]);
-          case 18:
+          case 22:
             b7 = _context4.sent;
-            _context4.next = 21;
+            _context4.next = 25;
             return dayValues(objConditions, moment().subtract(30, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), [30, 0]);
-          case 21:
+          case 25:
             b30 = _context4.sent;
             setInterviewLoading(false);
             setData([{
@@ -477,7 +498,7 @@ var RightDetail = function RightDetail(props) {
               nearlyDays: b7,
               nearlyDays1: b30
             }]);
-          case 24:
+          case 28:
           case "end":
             return _context4.stop();
         }

package/package.json

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