@zgfe/modules-dm 1.0.1 → 1.0.2-dm.1

package/es/modules/dataCollection/collectionEventList.js

@@ -150,6 +150,11 @@ var CollectionEventList = function CollectionEventList(props) {
 
 
   var createEventGroup = function createEventGroup() {
+    if (eventNameInput.length > 20) {
+      message.error('名称不可超过20字符');
+      return;
+    }
+
     request(apis.upsertEventGroup, {
       method: 'post',
       data: {

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

@@ -82,6 +82,7 @@
           }
         }
         .alias_name {
+          background: #fff !important;
           border: none;
         }
         .ant-input:focus,
@@ -163,6 +164,7 @@
             display: none;
             margin-left: 10px;
             font-size: 16px !important;
+            cursor: pointer;
           }
           .copy-text:hover {
             color: @primary-color;
@@ -171,6 +173,7 @@
           .collect-icon-active {
             margin: 0 4px;
             font-size: 16px !important;
+            cursor: pointer;
           }
           .collect-icon {
             color: #999;
@@ -220,9 +223,22 @@
       &:hover {
         .fuzhi {
           display: inline-block;
+          cursor: pointer;
         }
       }
     }
+    .alias_name {
+      background: #fff !important;
+      border: none;
+      cursor: pointer;
+    }
+    .ant-input:focus,
+    .ant-input-focused {
+      background-color: #fff !important;
+      border-bottom: 1px solid @primary-color;
+      border-radius: 0 !important;
+      box-shadow: none !important;
+    }
     .attr_alias_name {
       cursor: pointer;
       user-select: none;

package/es/modules/dataCollection/tablePlus.js

@@ -66,7 +66,7 @@ var TablePlus = function TablePlus(props) {
   }; // 表格class处理
 
 
-  var rowClassNameHandle = function rowClassNameHandle(record, index) {
+  var rowClassNameHandle = function rowClassNameHandle(record) {
     if (record.groupId != undefined) {
       return 'group-row';
     } else {
@@ -348,7 +348,9 @@ var TablePlus = function TablePlus(props) {
           placement: "bottom"
         }, /*#__PURE__*/React.createElement("span", {
           className: "group-handle"
-        }, "\u79FB\u52A8\u5230\u7EC4")), record.groupId != -1 && /*#__PURE__*/React.createElement(React.Fragment, null, groupPopoverContent(record, 'copy') != null && /*#__PURE__*/React.createElement(Popover, {
+        }, /*#__PURE__*/React.createElement(IconFont, {
+          type: "yidong"
+        }), "\u79FB\u52A8\u5230\u7EC4")), record.groupId != -1 && /*#__PURE__*/React.createElement(React.Fragment, null, groupPopoverContent(record, 'copy') != null && /*#__PURE__*/React.createElement(Popover, {
           content: function content() {
             return groupPopoverContent(record, 'copy');
           },
@@ -356,12 +358,16 @@ var TablePlus = function TablePlus(props) {
           placement: "bottom"
         }, /*#__PURE__*/React.createElement("span", {
           className: "group-handle"
-        }, "\u590D\u5236\u5230\u7EC4")), /*#__PURE__*/React.createElement("span", {
+        }, /*#__PURE__*/React.createElement(IconFont, {
+          type: "yidong"
+        }), "\u590D\u5236\u5230\u7EC4")), /*#__PURE__*/React.createElement("span", {
           className: "group-handle",
           onClick: function onClick() {
             return groupHandle('move-out', record);
           }
-        }, "\u79FB\u51FA\u5206\u7EC4"))));
+        }, /*#__PURE__*/React.createElement(IconFont, {
+          type: "yidong"
+        }), "\u79FB\u51FA\u5206\u7EC4"))));
       } else {
         return /*#__PURE__*/React.createElement("div", {
           className: "event_name"
@@ -421,7 +427,7 @@ var TablePlus = function TablePlus(props) {
     key: 'last_insert_time',
     width: 187,
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement("div", null, record.insert_time);
+      return /*#__PURE__*/React.createElement("div", null, record.last_insert_time);
     }
   }, {
     title: /*#__PURE__*/React.createElement(Select, {
@@ -456,6 +462,7 @@ var TablePlus = function TablePlus(props) {
         style: {
           width: 150
         },
+        disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
         onChange: function onChange(e) {
           return eventHiddenChange(e, 'event_hidden', record.event_id);
         },
@@ -501,6 +508,7 @@ var TablePlus = function TablePlus(props) {
         style: {
           width: 150
         },
+        disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
         onChange: function onChange(e) {
           return eventHiddenChange(e, 'is_stop', record.event_id);
         },
@@ -573,7 +581,7 @@ var TablePlus = function TablePlus(props) {
     loading: props.loading,
     dataSource: tableHandleData,
     rowClassName: function rowClassName(record, index) {
-      return rowClassNameHandle(record, index);
+      return rowClassNameHandle(record);
     },
     scroll: {
       x: 1300,

package/es/modules/dataManage/index.js

@@ -22,7 +22,7 @@ import DataCollection from '../dataCollection';
 var DataManage = function DataManage(props) {
   var classPrefix = 'data-manage';
 
-  var _useState = useState('1'),
+  var _useState = useState('0'),
       _useState2 = _slicedToArray(_useState, 2),
       menuTab = _useState2[0],
       setMenuTab = _useState2[1];
@@ -49,7 +49,7 @@ var DataManage = function DataManage(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-menu")
   }, /*#__PURE__*/React.createElement(Menu, {
-    defaultSelectedKeys: ['1'],
+    defaultSelectedKeys: ['0'],
     onSelect: onSelect,
     items: items
   })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null));

package/es/modules/dataPlan/addEventOrUser.js

@@ -21,7 +21,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, Table, Modal, Form } from 'antd';
+import { Input, Button, Select, Table, Modal, Form, message } from 'antd';
 var Option = Select.Option;
 import React, { useEffect, useState } from 'react';
 import './styles/index.less';
@@ -93,11 +93,21 @@ var addEventOrUser = function addEventOrUser(props) {
   var handleRow = function handleRow(type, data) {
     // console.log(type, data, tableRowData);
     if (type == 'add') {
+      if (tableRowData.length >= 50) {
+        message.error('不可添加，最多添加50条数据');
+        return;
+      }
+
       var newRows = {
         key: tableRowData[tableRowData.length - 1].key + 1
       };
       setTableRowData([].concat(_toConsumableArray(tableRowData), [newRows]));
     } else {
+      if (tableRowData.length <= 1) {
+        message.error('不可删除，最少保留1条数据');
+        return;
+      }
+
       var _arr = Object.assign([], tableRowData).filter(function (item) {
         if (item.key != (data === null || data === void 0 ? void 0 : data.key)) return item;
       });
@@ -257,6 +267,9 @@ var addEventOrUser = function addEventOrUser(props) {
     autoComplete: "off",
     onFinish: onFinish
   }, /*#__PURE__*/React.createElement(Table, {
+    scroll: {
+      y: 400
+    },
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     dataSource: tableRowData,

package/es/modules/dataPlan/addPlan.js

@@ -145,6 +145,19 @@ var AddPlan = function AddPlan(props) {
     maxCount: 1,
     showUploadList: false,
     beforeUpload: function beforeUpload(file) {
+      console.log(file);
+      var fileType = file.name.split('.');
+
+      if (fileType[fileType.length - 1] != 'xlsx' && fileType[fileType.length - 1] != 'xsl') {
+        message.error('上传仅支持xlsx或xsl格式的文件');
+        return;
+      }
+
+      if (file.size > 5 * 1024 * 1024) {
+        message.error('最大支持上传5M的文件');
+        return;
+      }
+
       var formData = new FormData();
       formData.append('file', file, file.name);
       var data = new FormData();
@@ -597,7 +610,7 @@ var AddPlan = function AddPlan(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"
   }), "\u4E0B\u8F7D\u6A21\u677F"), /*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement(Button, null, /*#__PURE__*/React.createElement(IconFont, {
-    type: "xiazai1"
+    type: "daochu"
   }), "\u6587\u4EF6\u4E0A\u4F20")))), /*#__PURE__*/React.createElement(Search, {
     type: listTab == '1' ? 'event' : 'user',
     total: searchTotal,

package/es/modules/dataPlan/index.js

@@ -197,7 +197,7 @@ var PlanList = function PlanList(props) {
   }, !drawerShow && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-switchbox clearfix")
   }, /*#__PURE__*/React.createElement("div", {
-    className: "switch"
+    className: "switch-div"
   }, /*#__PURE__*/React.createElement("span", null, "\u57CB\u70B9\u65B9\u6848\u63A7\u5236"), /*#__PURE__*/React.createElement(Switch, {
     onChange: isOpenChang,
     checkedChildren: "\u5F00",

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

@@ -40,7 +40,7 @@
     // margin-top: 26px;
     // padding-top: 26px;
     // border-top: 1px solid #e8efff;
-    .switch {
+    .switch-div {
       float: left;
       span {
         margin-right: 20px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.1",
+  "version": "1.0.2-dm.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.7-dmd.0",
+    "@zgfe/business-lib": "1.1.7-dmd.1",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9320512c29932b5faeb56719862c27aa22a9e52c",
+  "gitHead": "21b241c8db6f499daff43a19cbea9bdae598bd2f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }