@zgfe/modules-dm 1.0.56-zhongyuan.33 → 1.0.56-zhongyuan.35

package/es/modules/dataManage/collectionAttributeList.js

@@ -287,7 +287,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           //   record.isIdMappingProp ||
           //   record.category === 'fixed'
           // }
-          disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+          disabled: isDemo ||
+          // !authority[1000004] ||
+          record.category === 'fixed' || record.owner == 'zg_abp',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -323,22 +325,22 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }
     }
   }, {
-    title: '最后上报时间',
+    title: '数据上报',
     dataIndex: 'lastInsertTime',
-    width: 180,
+    width: 100,
     render: function render(text, record, index) {
       return /*#__PURE__*/React.createElement("div", {
         className: "attr-name"
-      }, text);
+      }, text ? '有' : '无');
     }
   }, {
-    title: '数据上报',
+    title: '最后上报时间',
     dataIndex: 'lastInsertTime',
-    width: 100,
+    width: 180,
     render: function render(text, record, index) {
       return /*#__PURE__*/React.createElement("div", {
         className: "attr-name"
-      }, text ? '有' : '无');
+      }, text);
     }
   }].concat(_toConsumableArray(source == 'event' ? [{
     title: '属性值别名',

package/es/modules/dataManage/components/tablePlus.js

@@ -986,7 +986,12 @@ var TablePlus = function TablePlus(props) {
           onClick: function onClick() {
             eventTextHandle(record);
           }
-        }, "\u6D4B\u8BD5")) : null, /*#__PURE__*/React.createElement("span", {
+        }, "\u6D4B\u8BD5")) : null, /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          style: {
+            padding: 0
+          },
+          disabled: isDemo || !authority[1000004],
           className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
           onClick: function onClick() {
             if (isDemo || !authority[1000004]) {
@@ -995,7 +1000,7 @@ var TablePlus = function TablePlus(props) {
             }
             eventItemDel(record);
           }
-        }, "\u5220\u9664")));
+        }, ' ', "\u5220\u9664")));
       }
     }
   }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.33",
+  "version": "1.0.56-zhongyuan.35",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "0945f02411a1a52b113854714bca45ae1a24be78",
+  "gitHead": "060cbb2a2f6604fda7ca284cdf54678a2d6a4699",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }