@zgfe/modules-dm 1.0.2-dm.29 → 1.0.2-dm.31

package/es/modules/dataCollection/styles/index.less

@@ -1,11 +1,7 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .data-collection {
   position: relative;
-  // width: calc(100% - 288px);
-  // height: 100%;
-  margin-top: 16px;
   margin-right: 24px;
-  margin-bottom: 24px;
   padding: 24px;
   padding-top: 10px;
   background: #fff;

package/es/modules/dataManage/styles/index.less

@@ -17,6 +17,7 @@
 .data-manage {
   position: relative;
   display: flex;
+  height: 100%;
   background: #f5f5f5;
   .tabs-box {
     position: relative;
@@ -84,6 +85,7 @@
   }
   .dmcontent {
     width: calc(100% - 264px);
+    padding: 16px 0 24px 0;
   }
   .dmcontent-collapsed {
     width: calc(100% - 104px);

package/es/modules/dataPlan/addPlan.js

@@ -24,6 +24,7 @@ import './styles/index.less';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import _ from 'lodash';
+import { getAppID } from '../../utils';
 import Search from './search';
 import EventList from './eventList';
 import UserAttributeList from './userAttributeList';
@@ -57,7 +58,7 @@ var AddPlan = function AddPlan(props) {
       request(apis.queryPlanDetail, {
         method: 'get',
         params: {
-          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+          appId: getAppID(currentApp),
           id: props.detailId
         }
       }).then(function (res) {
@@ -108,9 +109,9 @@ var AddPlan = function AddPlan(props) {
     });
 
     if (listTab == '1') {
-      window.open("".concat(apis.downloadPlanEvent, "?appId=").concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, "&planId=").concat(props.detailId, "&eventName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
+      window.open("".concat(apis.downloadPlanEvent, "?appId=").concat(getAppID(currentApp), "&planId=").concat(props.detailId, "&eventName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
     } else {
-      window.open("".concat(apis.downloadPlanProp, "?appId=").concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, "&planId=").concat(props.detailId, "&propName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
+      window.open("".concat(apis.downloadPlanProp, "?appId=").concat(getAppID(currentApp), "&planId=").concat(props.detailId, "&propName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
     }
   };
 
@@ -178,7 +179,7 @@ var AddPlan = function AddPlan(props) {
       formData.append('file', file, file.name);
       var data = new FormData();
       data.append('upload', file);
-      data.append('appId', currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+      data.append('appId', getAppID(currentApp));
       data.append('planName', '');
       request(apis.uploadPlan, {
         method: 'post',
@@ -471,7 +472,7 @@ var AddPlan = function AddPlan(props) {
       }
     });
     var ManagementPlan = {
-      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      appId: getAppID(currentApp),
       planId: props.detailId != -1 ? props.detailId : 0,
       planName: planName,
       eventPlanList: eventPlanList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.29",
+  "version": "1.0.2-dm.31",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "cc080cf3bbabd5ba7eb4c88bb49695de615f63a7",
+  "gitHead": "32d73da9d71950ec7e16cb17876d152f83735894",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }