@zgfe/modules-dm 1.0.56-zhongyuan.23 → 1.0.56-zhongyuan.25

package/es/modules/dataManage/collectionAttributeList.js

@@ -280,7 +280,13 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         return /*#__PURE__*/React.createElement(Input, {
           className: "alias_name",
           placeholder: "\u7F16\u8F91\u522B\u540D",
-          disabled: isDemo || !authority[1722838507] || record.isIdMappingProp || record.category === 'fixed',
+          // disabled={
+          //   isDemo ||
+          //   !authority[1722838507] ||
+          //   record.isIdMappingProp ||
+          //   record.category === 'fixed'
+          // }
+          disabled: true,
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -300,7 +306,13 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }, /*#__PURE__*/React.createElement(Input, {
           className: "alias_name",
           placeholder: "\u7F16\u8F91\u522B\u540D",
-          disabled: isDemo || !authority[1722838507] || record.isIdMappingProp || record.category === 'fixed',
+          // disabled={
+          //   isDemo ||
+          //   !authority[1722838507] ||
+          //   record.isIdMappingProp ||
+          //   record.category === 'fixed'
+          // }
+          disabled: true,
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -323,16 +335,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     width: 120,
     render: function render(record) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, !rowRenderHandle(record.name) && (/*#__PURE__*/React.createElement("span", {
-        className: "attr_alias_name ".concat(isDemo || record.isIdMappingProp || record.category === 'fixed' ? 'disabled' : ''),
-        onClick: function onClick() {
-          if (record.isIdMappingProp || record.category === 'fixed') return;
-          if (isDemo) {
-            message.error('demo环境，无法编辑');
-            return;
-          }
-          setattrId(record.attr_id);
-          setAttrAliasNameShow(true);
-        }
+        className: "attr_alias_name 'disabled'"
       }, record.value_dict ? '已编辑' : '编辑')));
     }
   }] : []), [{
@@ -377,7 +380,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           width: 100
         },
-        disabled: isDemo || record.isIdMappingProp || record.category === 'fixed',
+        // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
+        disabled: true,
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -433,7 +437,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           width: 100
         },
-        disabled: isDemo || record.isIdMappingProp || record.category === 'fixed',
+        // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
+        disabled: true,
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'hidden');
         },
@@ -494,7 +499,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           width: 100
         },
-        disabled: isDemo || record.isIdMappingProp,
+        // disabled={isDemo || record.isIdMappingProp}
+        disabled: true,
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'encryption_type');
         },
@@ -521,20 +527,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     width: 120,
     render: function render(record) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, !rowRenderHandle(record.name) && (/*#__PURE__*/React.createElement("span", {
-        className: "attr_alias_name ".concat(isDemo || record.isIdMappingProp || record.category === 'fixed' ? 'disabled' : ''),
-        onClick: function onClick() {
-          if (!authority[1722838507]) {
-            message.error('无编辑权限');
-            return;
-          }
-          if (record.isIdMappingProp || record.category === 'fixed') return;
-          if (isDemo) {
-            message.error('demo环境，无法编辑');
-            return;
-          }
-          setattrId(record.id);
-          setAttrAliasNameShow(true);
-        }
+        className: "attr_alias_name disabled"
       }, record.value_dict ? '已编辑' : '编辑')));
     }
   }] : []), _toConsumableArray(source === 'user' ? [{
@@ -634,9 +627,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           padding: 0
         },
-        disabled: record.category === 'fixed' || !authority[1722838563],
+        disabled: source === 'event' ? record.owner == 'zg_abp' : false || record.category == 'fixed' || isDemo || !authority[1000004],
         onClick: function onClick() {
-          if (!authority[1722838563]) {
+          if (isDemo || !authority[1000004]) {
             message.error('无删除权限');
             return;
           }
@@ -909,7 +902,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         setExportAliasTmp(false);
       });
     }
-  }, "\u6A21\u677F\u4E0B\u8F7D")), attrExcelData.length > 0 && (/*#__PURE__*/React.createElement("div", {
+  }, "\u6A21\u677F\u4E0B\u8F7D")), (attrExcelData === null || attrExcelData === void 0 ? void 0 : attrExcelData.length) > 0 && (/*#__PURE__*/React.createElement("div", {
     className: "clearData",
     onClick: clearData
   }, /*#__PURE__*/React.createElement(IconFont, {

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

@@ -690,19 +690,15 @@ var TablePlus = function TablePlus(props) {
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
         className: "alias_name_text"
-      }, record.alias_name)), /*#__PURE__*/React.createElement(IconFont, {
+      }, record.alias_name)), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
-          if (!authority[1000003]) {
-            message.error('无操作权限');
-            return;
-          }
           setAliasNameInput(record.alias_name);
           setAliasNameId(record.event_id);
           setaliasNameShow(true);
         },
         type: "zhongmingming"
-      }));
+      })));
     }
   }, {
     title: '触发时机',
@@ -723,7 +719,7 @@ var TablePlus = function TablePlus(props) {
         placement: "top"
       }, /*#__PURE__*/React.createElement("div", {
         className: "alias_name_text"
-      }, record.triggeringOccasion)), /*#__PURE__*/React.createElement(IconFont, {
+      }, record.triggeringOccasion)), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
           setTriggeringInput(record.triggeringOccasion);
@@ -731,7 +727,7 @@ var TablePlus = function TablePlus(props) {
           setTriggeringShow(true);
         },
         type: "zhongmingming"
-      }));
+      })));
     }
   },
   // {
@@ -757,14 +753,14 @@ var TablePlus = function TablePlus(props) {
         }, maidianList.filter(function (obj) {
           return obj.value == item;
         })[0].label);
-      }), /*#__PURE__*/React.createElement(IconFont, {
+      }), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
           setIsMaidianModal(true);
           text && setCurrentMaidian(text.split(','));
           setCurrentRow(record);
         }
-      }));
+      })));
     }
   }, {
     title: '末次上报时间',
@@ -787,10 +783,10 @@ var TablePlus = function TablePlus(props) {
       }).length, /*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
-          if (!authority[1000003]) {
-            message.error('无修改权限');
-            return;
-          }
+          // if (!authority[1000003]) {
+          //   message.error('无修改权限');
+          //   return;
+          // }
           props.eventAttrDataHandle(record);
         }
       }));
@@ -936,7 +932,7 @@ var TablePlus = function TablePlus(props) {
         ellipsis: {
           tooltip: text
         }
-      }, text), /*#__PURE__*/React.createElement(IconFont, {
+      }, text), record.groupId && (/*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
           if (!authority[1000003]) {
@@ -947,7 +943,7 @@ var TablePlus = function TablePlus(props) {
           setCurrentRemark(text);
           setCurrentRow(record);
         }
-      }));
+      })));
     }
   }, {
     title: '操作',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.23",
+  "version": "1.0.56-zhongyuan.25",
   "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": "2d032212777acf8610651a5bb151075b36fec1cf",
+  "gitHead": "158c55e0f782d1e6a6ec9fdfdc7af630ed542fd7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }