@zgfe/modules-dm 1.0.2-dm.0 → 1.0.2-dm.2

package/es/modules/dataCollection/collectionEventList.js

@@ -150,6 +150,11 @@ var CollectionEventList = function CollectionEventList(props) {
 
 
   var createEventGroup = function createEventGroup() {
+    if (eventNameInput == '') {
+      message.error('请输入分组名称');
+      return;
+    }
+
     if (eventNameInput.length > 20) {
       message.error('名称不可超过20字符');
       return;

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 {
@@ -427,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, {
@@ -462,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);
         },
@@ -507,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);
         },
@@ -579,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.0",
+  "version": "1.0.2-dm.2",
   "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": "785ae49b00db143e5a1d2f6f153ae7e30ce6b6cb",
+  "gitHead": "21b241c8db6f499daff43a19cbea9bdae598bd2f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }