@zgfe/modules-dm 1.0.2-dm.5 → 1.0.2-dm.7

package/es/modules/dataCollection/collectionAttributeList.js

@@ -329,6 +329,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }).catch(function (err) {
         message.error('上传失败');
       });
+      return false;
     }
   }; // 清空属性值别名excel数据
 

package/es/modules/dataCollection/collectionEventList.d.ts

@@ -8,6 +8,7 @@ interface queryPlanType {
 interface PropsType {
     isOpen: number;
     queryPlanData: queryPlanType;
+    updateEventMetas: Function;
 }
 declare const CollectionEventList: React.FC<PropsType>;
 export default CollectionEventList;

package/es/modules/dataCollection/collectionEventList.js

@@ -26,6 +26,8 @@ var CollectionEventList = function CollectionEventList(props) {
       currentApp = _useContext.currentApp,
       isDemo = _useContext.isDemo;
 
+  var updateEventMetas = props.updateEventMetas;
+
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
       total = _useState2[0],
@@ -304,7 +306,8 @@ var CollectionEventList = function CollectionEventList(props) {
     markTypeFilter: markTypeFilter,
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
-    eventAttrDataHandle: eventAttrDataHandle
+    eventAttrDataHandle: eventAttrDataHandle,
+    updateEventMetas: updateEventMetas
   })), eventAttrListShow && /*#__PURE__*/React.createElement(CollectionAttributeList, {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,

package/es/modules/dataCollection/index.d.ts

@@ -1,3 +1,6 @@
 import React from 'react';
-declare const DataCollection: React.FC;
+interface DataCollectionProps {
+    updateEventMetas: Function;
+}
+declare const DataCollection: React.FC<DataCollectionProps>;
 export default DataCollection;

package/es/modules/dataCollection/index.js

@@ -25,6 +25,8 @@ var DataCollection = function DataCollection(props) {
       currentApp = _useContext.currentApp,
       isDemo = _useContext.isDemo;
 
+  var updateEventMetas = props.updateEventMetas;
+
   var _useState = useState(1),
       _useState2 = _slicedToArray(_useState, 2),
       listTab = _useState2[0],
@@ -86,7 +88,8 @@ var DataCollection = function DataCollection(props) {
     key: "2"
   })), listTab == 1 && /*#__PURE__*/React.createElement(EventList, {
     isOpen: isOpen,
-    queryPlanData: queryPlanData
+    queryPlanData: queryPlanData,
+    updateEventMetas: updateEventMetas
   }), listTab == 2 && /*#__PURE__*/React.createElement(UserAttributeList, {
     isOpen: isOpen,
     queryPlanData: queryPlanData,

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

@@ -99,6 +99,16 @@
         }
         .group-row {
           border-top: 12px solid #f5f5f5;
+          .ant-table-cell-fix-left {
+            left: 0px;
+            display: block;
+            width: 500px;
+            background: #fff;
+          }
+          .ant-table-cell-fix-left-first::after,
+          .ant-table-cell-fix-left-last::after {
+            box-shadow: none;
+          }
           td {
             padding: 6px 16px;
           }
@@ -111,7 +121,7 @@
         }
         .group-box {
           display: flex;
-          width: 500px;
+          width: 800px;
           line-height: 30px;
           .ant-input {
             width: 150px;
@@ -121,13 +131,13 @@
             margin-right: 4px;
             font-size: 18px !important;
           }
-          .group-text {
-            display: -webkit-box;
-            width: 120px;
-            overflow: hidden;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-          }
+          // .group-text {
+          //   display: -webkit-box;
+          //   width: 120px;
+          //   overflow: hidden;
+          //   -webkit-box-orient: vertical;
+          //   -webkit-line-clamp: 1;
+          // }
           .group-handle {
             margin-left: 30px;
             cursor: pointer;

package/es/modules/dataCollection/tablePlus.d.ts

@@ -22,6 +22,7 @@ interface queryPlanType {
 }
 interface TablePlusType {
     tableHandleData: DataType[];
+    updateEventMetas: Function;
     Refresh: Function;
     eventActiveFilter: Function;
     markTypeFilter: Function;

package/es/modules/dataCollection/tablePlus.js

@@ -29,7 +29,8 @@ var TablePlus = function TablePlus(props) {
   var classPrefix = 'table-plus';
   var tableHandleData = props.tableHandleData,
       queryPlanData = props.queryPlanData,
-      isOpen = props.isOpen;
+      isOpen = props.isOpen,
+      updateEventMetas = props.updateEventMetas;
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
@@ -60,6 +61,8 @@ var TablePlus = function TablePlus(props) {
       if (res) {
         message.success('修改成功');
         props.Refresh();
+        console.log(updateEventMetas);
+        updateEventMetas != undefined ? updateEventMetas() : null; // 更新store
       }
     }).catch(function (err) {
       message.error('修改失败');
@@ -272,14 +275,16 @@ var TablePlus = function TablePlus(props) {
     if (eventGroupId != undefined) _temp = {
       eventGroupId: eventGroupId
     };
+    if (type != 'copy') _temp = _objectSpread(_objectSpread({}, _temp), {}, {
+      oldEventGroupId: data.groupId
+    });
     request(apis.operateGroupRelations, {
       method: 'post',
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0,
         hasPublicAttrView: true,
-        eventIds: groupCheckedData[data.groupId].join(','),
-        oldEventGroupId: type == 'copy' ? null : data.groupId
+        eventIds: groupCheckedData[data.groupId].join(',')
       }, _temp)
     }).then(function (res) {
       message.success('成功');
@@ -341,15 +346,9 @@ var TablePlus = function TablePlus(props) {
           className: "group-box"
         }, /*#__PURE__*/React.createElement(IconFont, {
           type: "left"
-        }), /*#__PURE__*/React.createElement(Popover, {
-          content: function content() {
-            return record.groupId == -1 ? '未分组' : record.groupName;
-          },
-          trigger: "hover",
-          placement: "top"
-        }, /*#__PURE__*/React.createElement("span", {
+        }), /*#__PURE__*/React.createElement("span", {
           className: "group-text"
-        }, record.groupId == -1 ? '未分组' : record.groupName)), ((_groupCheckedData$rec = groupCheckedData[record.groupId]) === null || _groupCheckedData$rec === void 0 ? void 0 : _groupCheckedData$rec.length) > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popover, {
+        }, record.groupId == -1 ? '未分组' : record.groupName), ((_groupCheckedData$rec = groupCheckedData[record.groupId]) === null || _groupCheckedData$rec === void 0 ? void 0 : _groupCheckedData$rec.length) > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popover, {
           content: function content() {
             return groupPopoverContent(record, 'move-in');
           },

package/es/modules/dataManage/index.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import './styles/index.less';
-declare const DataManage: React.FC;
+interface DataManageProps {
+    updateEventMetas: Function;
+}
+declare const DataManage: React.FC<DataManageProps>;
 export default DataManage;

package/es/modules/dataManage/index.js

@@ -21,6 +21,7 @@ import DataCollection from '../dataCollection';
 
 var DataManage = function DataManage(props) {
   var classPrefix = 'data-manage';
+  var updateEventMetas = props.updateEventMetas;
 
   var _useState = useState('0'),
       _useState2 = _slicedToArray(_useState, 2),
@@ -52,7 +53,9 @@ var DataManage = function DataManage(props) {
     defaultSelectedKeys: ['0'],
     onSelect: onSelect,
     items: items
-  })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null));
+  })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, {
+    updateEventMetas: updateEventMetas
+  }), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null));
 };
 
 export default DataManage;

package/es/modules/dataPlan/addPlan.js

@@ -194,6 +194,7 @@ var AddPlan = function AddPlan(props) {
       }).catch(function (err) {
         message.error('上传失败');
       });
+      return false;
     }
   }; // 事件列表-渲染数据
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.5",
+  "version": "1.0.2-dm.7",
   "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": "67f8d1ed5d82858a8d44153a22b41cad2a1fe6c8",
+  "gitHead": "ebcb846bfe38cd43875714df057c9822d0efe735",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }