@zgfe/modules-dm 1.0.57-zhongyuan.59 → 1.0.57-zhongyuan.60

package/es/modules/dataManage/collectionAttributeList.js

@@ -306,7 +306,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          record.category === 'fixed' || record.owner == 'zg_abp',
+          eventWhiteList.includes(record.attr_name) || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -334,7 +334,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          record.category === 'fixed' || record.owner == 'zg_abp',
+          //
+          // record.owner == 'zg_abp'
+          eventWhiteList.includes(record.attr_name) || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -430,7 +432,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || !record.canUpdate || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || !record.canUpdate || record.category === 'fixed' || eventWhiteList.includes(record.attr_name),
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -487,7 +489,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || eventWhiteList.includes(record.attr_name),
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'hidden');
         },
@@ -549,7 +551,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || eventWhiteList.includes(record.attr_name),
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'encryption_type');
         },
@@ -623,20 +625,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    // dataIndex: 'category',
+    dataIndex: 'category',
     width: 120,
-    render: function render(record) {
-      // let json: { [x: string]: string } = {
-      //   fixed: '内置',
-      //   custom: '自定义',
-      // };
-      //事件下的属性
-      var eventAttrList = eventWhiteList.includes(eventAttrsData.event_name) ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (j) {
-        return j.attr_name;
-      }) : [];
-      return /*#__PURE__*/React.createElement("div", null, eventAttrList && eventAttrList.length > 0 ? eventAttrList.filter(function (item) {
-        return ownerWhiteListDataList.includes(item);
-      }) ? '内置' : '自定义' : '自定义');
+    render: function render(category) {
+      var json = {
+        fixed: '内置',
+        custom: '自定义'
+      };
+      return /*#__PURE__*/React.createElement("div", null, json[category]);
     }
   }, {
     title: '创建人',
@@ -681,19 +677,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    // dataIndex: 'owner',
+    dataIndex: 'attr_name',
     width: 120,
     render: function render(record) {
       var json = {
         zg_abp: '内置',
         zg: '自定义'
       };
-      var eventAttrList = eventWhiteList.includes(eventAttrsData.event_name) ? eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (j) {
-        return j.attr_name;
-      }) : [];
-      return /*#__PURE__*/React.createElement("div", null, eventAttrList && eventAttrList.length > 0 ? eventAttrList.filter(function (item) {
-        return ownerWhiteListDataList.includes(item);
-      }) ? '内置' : '自定义' : '自定义');
+      return /*#__PURE__*/React.createElement("div", null, ownerWhiteListDataList.includes(record) ? '内置' : '自定义');
     }
   }]), [{
     title: '操作',
@@ -705,7 +696,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           padding: 0
         },
-        disabled: source === 'event' ? record.owner == 'zg_abp' || !authority[1000004] || !record.canUpdate : record.category == 'fixed' || isDemo || !authority[1000004],
+        disabled: source === 'event' ? eventWhiteList.includes(record.attr_name) || !authority[1000004] || !record.canUpdate : record.category == 'fixed' || isDemo || !authority[1000004],
         onClick: function onClick() {
           if (isDemo || !authority[1000004]) {
             message.error('无删除权限');
@@ -939,7 +930,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     width: 64,
     render: function render(_, record, index) {
       return /*#__PURE__*/React.createElement("a", {
-        className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
+        className: "set ".concat(eventWhiteList.includes(record.attr_name) ? 'set-error' : ''),
         onClick: function onClick() {
           return dealEventAttr(index);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.59",
+  "version": "1.0.57-zhongyuan.60",
   "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": "e655d5290b7a1826c5d740d898dd2454460ae513",
+  "gitHead": "d394203f85c3a1180e90cdfc2a8c315cbc20c3d2",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }