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

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/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;
           }
@@ -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.js

@@ -341,15 +341,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/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.6",
   "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": "a5df84fee76da638681affd4c57d4b27acdf91d8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }