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

package/es/modules/dataManage/collectionAttributeList.d.ts

@@ -12,6 +12,7 @@ interface PropsType {
         event_id: number;
         event_name: string;
         owner?: string;
+        newOwner?: string;
         attr_name: string;
     };
     isOpen: number;

package/es/modules/dataManage/collectionAttributeList.js

@@ -139,7 +139,15 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       var _temp = eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_attrs.map(function (item) {
         item.name = item.attr_name;
         item.type = item.prop_type;
-        return item;
+        if (ownerWhiteListDataList.includes(item === null || item === void 0 ? void 0 : item.attr_name)) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            newOwner: 'zg_abp'
+          });
+        } else {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            newOwner: 'zg'
+          });
+        }
       }) // 业务不展示
       .filter(function (item) {
         return item.attr_id != 31415926;
@@ -306,7 +314,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          eventWhiteList.includes(record.attr_name) || record.category === 'fixed',
+          record.newOwner == 'zg_abp' || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -334,9 +342,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          //
-          // record.owner == 'zg_abp'
-          eventWhiteList.includes(record.attr_name) || record.category === 'fixed',
+          record.newOwner == 'zg_abp' || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -432,7 +438,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || !record.canUpdate || record.category === 'fixed' || eventWhiteList.includes(record.attr_name),
+        disabled: isDemo || !authority[1000004] || !record.canUpdate || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -489,7 +495,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || eventWhiteList.includes(record.attr_name),
+        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'hidden');
         },
@@ -551,7 +557,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || eventWhiteList.includes(record.attr_name),
+        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'encryption_type');
         },
@@ -677,14 +683,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    dataIndex: 'attr_name',
+    dataIndex: 'newOwner',
     width: 120,
     render: function render(record) {
       var json = {
         zg_abp: '内置',
         zg: '自定义'
       };
-      return /*#__PURE__*/React.createElement("div", null, ownerWhiteListDataList.includes(record) ? '内置' : '自定义');
+      return /*#__PURE__*/React.createElement("div", null, json[record]);
     }
   }]), [{
     title: '操作',
@@ -696,7 +702,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           padding: 0
         },
-        disabled: source === 'event' ? eventWhiteList.includes(record.attr_name) || !authority[1000004] || !record.canUpdate : record.category == 'fixed' || isDemo || !authority[1000004],
+        disabled: source === 'event' ? record.newOwner == 'zg_abp' || !authority[1000004] || !record.canUpdate : record.category == 'fixed' || isDemo || !authority[1000004],
         onClick: function onClick() {
           if (isDemo || !authority[1000004]) {
             message.error('无删除权限');
@@ -1150,7 +1156,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   //页面加载完成后才能获取到对应的元素及其位置
   useEffect(function () {
     var _Y = getTableScroll(60, 'dataManageAttrTable');
-    // console.log('_Y', _Y);
     setScrollY(_Y);
   }, []);
   return /*#__PURE__*/React.createElement("div", {
@@ -1219,7 +1224,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }).filter(function (item) {
       return category == '' || item.category === category;
     }).filter(function (item) {
-      return owner == '' || item.owner === owner;
+      return owner == '' || item.newOwner === owner;
     }),
     pagination: false
   }), source == 'event' && (/*#__PURE__*/React.createElement(Button, {
@@ -1251,7 +1256,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         name: '',
         aliasName: '',
         type: 1,
-        encryptionType: 0
+        encryptionType: 0,
+        newOwner: 'zg'
       }]));
     }
   }, /*#__PURE__*/React.createElement(IconFont, {

package/es/modules/dataManage/collectionEventList.js

@@ -460,7 +460,7 @@ var CollectionEventList = function CollectionEventList(props) {
       fileName: "\u5143\u4E8B\u4EF6\u5217\u8868_".concat(moment().format('YYYYMMDD'))
     }).then(function (res) {});
   };
-  var items = [{
+  var items = showProdDownload ? [{
     key: '2',
     disabled: !authority[1700636282],
     label: (/*#__PURE__*/React.createElement("a", {
@@ -475,7 +475,7 @@ var CollectionEventList = function CollectionEventList(props) {
     }), /*#__PURE__*/React.createElement("span", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406")))
   }, {
     key: '3',
-    disabled: isDemo || !authority[1722837260] || !showProdDownload,
+    disabled: isDemo || !authority[1722837260],
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: function onClick() {
@@ -485,10 +485,10 @@ var CollectionEventList = function CollectionEventList(props) {
       type: "xiazai1",
       size: 16,
       className: "creditPopClickIcon"
-    }), " ", /*#__PURE__*/React.createElement("span", null, "\u5BFC\u5165\u4E8B\u4EF6")))
+    }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5BFC\u5165\u4E8B\u4EF6")))
   }, {
     key: '4',
-    disabled: isDemo || !authority[1722837261] || !showProdDownload,
+    disabled: isDemo || !authority[1722837261],
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: exportEvent
@@ -496,7 +496,7 @@ var CollectionEventList = function CollectionEventList(props) {
       type: "daochu1",
       size: 16,
       className: "creditPopClickIcon"
-    }), " ", /*#__PURE__*/React.createElement("span", null, "\u5BFC\u51FA\u4E8B\u4EF6")))
+    }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5BFC\u51FA\u4E8B\u4EF6")))
   }, {
     key: '5',
     label: (/*#__PURE__*/React.createElement("a", {
@@ -511,7 +511,6 @@ var CollectionEventList = function CollectionEventList(props) {
     }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5F00\u53D1\u7BA1\u7406")))
   }, {
     key: '6',
-    disabled: !showProdDownload,
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: function onClick() {
@@ -524,7 +523,6 @@ var CollectionEventList = function CollectionEventList(props) {
     }), ' ', /*#__PURE__*/React.createElement("span", null, "\u751F\u6210\u6D4B\u8BD5\u62A5\u544A")))
   }, {
     key: '7',
-    disabled: !showProdDownload,
     label: (/*#__PURE__*/React.createElement("a", {
       className: "".concat(classPrefix, "-downItems"),
       onClick: function onClick() {
@@ -535,6 +533,31 @@ var CollectionEventList = function CollectionEventList(props) {
       size: 16,
       className: "creditPopClickIcon"
     }), /*#__PURE__*/React.createElement("span", null, "\u5BFC\u51FA\u6570\u636E\u5305")))
+  }] : [{
+    key: '2',
+    disabled: !authority[1700636282],
+    label: (/*#__PURE__*/React.createElement("a", {
+      className: "".concat(classPrefix, "-downItems"),
+      onClick: function onClick() {
+        return setEventGroupingShow(true);
+      }
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "guanli",
+      size: 16,
+      className: "creditPopClickIcon"
+    }), /*#__PURE__*/React.createElement("span", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406")))
+  }, {
+    key: '5',
+    label: (/*#__PURE__*/React.createElement("a", {
+      className: "".concat(classPrefix, "-downItems"),
+      onClick: function onClick() {
+        return setIsDevModalState(true);
+      }
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "icon-shishigailan",
+      size: 16,
+      className: "creditPopClickIcon"
+    }), ' ', /*#__PURE__*/React.createElement("span", null, "\u5F00\u53D1\u7BA1\u7406")))
   }];
   // 提交测试报告
   var _Form$useForm = Form.useForm(),

package/package.json

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