@zgfe/modules-dm 1.0.57-zhongyuan.8 → 1.0.57-zhongyuan.81

package/es/modules/clearRule/index.js

@@ -27,7 +27,8 @@ var className = 'clearRule';
 var ClearRule = function ClearRule() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var columns = [{
     title: '规则名',
     dataIndex: 'ruleName',
@@ -68,23 +69,32 @@ var ClearRule = function ClearRule() {
   }, {
     title: '操作',
     key: 'action',
+    width: 240,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
-        size: "middle"
+        size: 4
       }, authority[170928557414] && (/*#__PURE__*/React.createElement(Switch, {
         checked: record.status == 0 ? false : true,
         onChange: function onChange(e) {
           return _onChange(e, record);
         }
-      })), authority[170928557412] && /*#__PURE__*/React.createElement("a", {
+      })), authority[170928557412] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
-          return handleEditRule(record);
+          handleEditRule(record);
         }
-      }, "\u7F16\u8F91"), authority[170928557413] && /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91")), /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          return handleViewRule(record);
+        }
+      }, "\u67E5\u770B"), authority[170928557413] && (/*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        disabled: record.status == 1,
         onClick: function onClick() {
           return handleDeleteRule(record === null || record === void 0 ? void 0 : record.ruleId);
         }
-      }, "\u5220\u9664"));
+      }, "\u5220\u9664")));
     }
   }];
   // 编辑规则
@@ -104,7 +114,13 @@ var ClearRule = function ClearRule() {
     _useState8 = _slicedToArray(_useState7, 2),
     isCheckRuleModalOpen = _useState8[0],
     setIsCheckRuleModalOpen = _useState8[1];
+  // 行数据 修改查看时需要
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    ruleRowEdit = _useState10[0],
+    setRuleRowEdit = _useState10[1];
   var handleEditRule = function handleEditRule(ruleRow) {
+    setRuleRowEdit(undefined);
     request(apis.rule.checkRule, {
       method: 'post',
       data: {
@@ -133,10 +149,14 @@ var ClearRule = function ClearRule() {
         }
         getDetail(ruleRow.ruleId);
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
+  var handleViewRule = function handleViewRule(ruleRow) {
+    setRuleRowEdit(ruleRow);
+    getDetail(ruleRow.ruleId);
+  };
   var getDetail = function getDetail(ruleId) {
     setEditStatus(true);
     request(apis.rule.getRuleDetail, {
@@ -159,23 +179,24 @@ var ClearRule = function ClearRule() {
     setIsCheckRuleModalOpen(false);
   };
   // 新建规则显示
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    addruleShow = _useState10[0],
-    setAddruleshow = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    addruleShow = _useState12[0],
+    setAddruleshow = _useState12[1];
   var handleAddRule = function handleAddRule() {
+    setRuleRowEdit(undefined);
     setAddruleshow(true);
     setEditStatus(false);
   };
   // 下载报告
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isModalOpen = _useState12[0],
-    setIsModalOpen = _useState12[1];
-  var _useState13 = useState([]),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    downloadDate = _useState14[0],
-    setDownloadDate = _useState14[1];
+    isModalOpen = _useState14[0],
+    setIsModalOpen = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    downloadDate = _useState16[0],
+    setDownloadDate = _useState16[1];
   var handleSelectDate = function handleSelectDate(date) {
     setDownloadDate(date);
   };
@@ -197,18 +218,18 @@ var ClearRule = function ClearRule() {
     setIsModalOpen(false);
   };
   // 导入规则
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    openImportModal = _useState16[0],
-    setOpenImportModal = _useState16[1];
   var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    openImportModalResult = _useState18[0],
-    setOpenImportModalResult = _useState18[1];
-  var _useState19 = useState(),
+    openImportModal = _useState18[0],
+    setOpenImportModal = _useState18[1];
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    errorRule = _useState20[0],
-    setErrorRule = _useState20[1];
+    openImportModalResult = _useState20[0],
+    setOpenImportModalResult = _useState20[1];
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    errorRule = _useState22[0],
+    setErrorRule = _useState22[1];
   var handleImportResultOk = function handleImportResultOk() {
     setOpenImportModal(false);
     setOpenImportModalResult(false);
@@ -227,17 +248,53 @@ var ClearRule = function ClearRule() {
       fileName: "\u89C4\u5219\u5217\u8868_".concat(moment().format('YYYYMMDD'))
     }).then(function (res) {});
   };
+  // 总状态
+  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
+    style: {
+      fontSize: 24
+    },
+    spin: true,
+    onPointerEnterCapture: undefined,
+    onPointerLeaveCapture: undefined
+  });
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    allOpenRule = _useState24[0],
+    setAllOpenRule = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    statusLoading = _useState26[0],
+    setStatusLoading = _useState26[1];
+  var handleAllOpenStatus = function handleAllOpenStatus(value) {
+    setStatusLoading(true);
+    request(apis.rule.allOpenStatus, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        status: value ? 1 : 0
+      }
+    }).then(function (res) {
+      if (!res) return;
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
+        setAllOpenRule(value);
+        _getList(ruleSearchName);
+      }
+    }).finally(function () {
+      setStatusLoading(false);
+    });
+  };
   /**
    * 规则列表， 搜索名称， 规则列表状态开启/关闭， 删除规则
    */
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    ruleList = _useState22[0],
-    setRuleList = _useState22[1];
-  var _useState23 = useState(''),
-    _useState24 = _slicedToArray(_useState23, 2),
-    ruleSearchName = _useState24[0],
-    setRuleSearchName = _useState24[1];
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    ruleList = _useState28[0],
+    setRuleList = _useState28[1];
+  var _useState29 = useState(''),
+    _useState30 = _slicedToArray(_useState29, 2),
+    ruleSearchName = _useState30[0],
+    setRuleSearchName = _useState30[1];
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
@@ -248,27 +305,30 @@ var ClearRule = function ClearRule() {
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    _getList(ruleSearchName);
+    _getList(ruleSearchName, pagination);
   };
-  var _useState25 = useState({
+  var _useState31 = useState({
       current: 1,
       pageSize: 10,
-      total: 0
+      total: 0,
+      showQuickJumper: true,
+      showSizeChanger: true
     }),
-    _useState26 = _slicedToArray(_useState25, 2),
-    tableParams = _useState26[0],
-    setTableParams = _useState26[1];
+    _useState32 = _slicedToArray(_useState31, 2),
+    tableParams = _useState32[0],
+    setTableParams = _useState32[1];
   useEffect(function () {
     _getList();
   }, []);
   var _getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.rule.getRuleList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
@@ -281,12 +341,14 @@ var ClearRule = function ClearRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }
     });
   };
   var handleDeleteRule = function handleDeleteRule(ruleId) {
+    setRuleRowEdit(undefined);
     UseModal({
       onOk: function onOk() {
         return handleDeleteMap(ruleId);
@@ -309,73 +371,92 @@ var ClearRule = function ClearRule() {
         message.success("\u5220\u9664\u89C4\u5219\u6210\u529F\uFF01");
         handleSearch();
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
-  var _onChange = function _onChange(value, ruleRow) {
-    UseModal({
-      onOk: function onOk() {
-        return handleOpenRuleStatus(ruleRow);
-      },
-      okText: "".concat(ruleRow.status == 0 ? '仍然开启' : '仍然关闭'),
-      title: '警告',
-      content: "".concat(ruleRow.status == 0 ? '该规则与已开启规则可能产生冲突，请确认是否继续开启' : '该规则与开始运行现在关闭可能产生冲突，请确认是否关闭', " ")
-    });
-  };
-  var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
-    request(apis.rule.openRuleStatus, {
+  var statusCheck = function statusCheck(ruleRow) {
+    // 可直接关闭
+    if (ruleRow.status == 1) {
+      handleOpenRuleStatus(ruleRow);
+      return;
+    }
+    request(apis.rule.checkStatus, {
       method: 'post',
       data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         ruleId: ruleRow.ruleId,
         status: ruleRow.status ? 0 : 1
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
-        handleSearch();
+        if (res.data == 0) {
+          handleOpenRuleStatus(ruleRow);
+          return;
+        }
+        if (res.data == 3) {
+          UseModal({
+            onOk: function onOk() {
+              return handleOpenRuleStatus(ruleRow);
+            },
+            okText: "\u4ECD\u7136\u5F00\u542F",
+            title: '警告',
+            content: '该规则与已开启规则可能产生冲突，请确认是否继续开启'.concat(" ")
+          });
+          return;
+        }
+        if (res.data == 2 || res.data == 3) {
+          message.error(res.msg);
+          return;
+        }
       } else {
-        message.error('规则修改失败，请联系管理员');
+        message.error(res.msg);
       }
     });
   };
-  // 总状态
-  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
-    style: {
-      fontSize: 24
-    },
-    spin: true,
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  });
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    allOpenRule = _useState28[0],
-    setAllOpenRule = _useState28[1];
-  var _useState29 = useState(false),
-    _useState30 = _slicedToArray(_useState29, 2),
-    statusLoading = _useState30[0],
-    setStatusLoading = _useState30[1];
-  var handleAllOpenStatus = function handleAllOpenStatus(value) {
-    setStatusLoading(true);
-    request(apis.rule.allOpenStatus, {
+  var _onChange = function _onChange(value, ruleRow) {
+    statusCheck(ruleRow);
+  };
+  var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
+    request(apis.rule.openRuleStatus, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        status: value ? 1 : 0
+        ruleId: ruleRow.ruleId,
+        status: ruleRow.status ? 0 : 1
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
-        setAllOpenRule(value);
-        _getList(ruleSearchName);
+        message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
+        handleSearch();
+      } else {
+        if (res.data == 1) {
+          // getDetail(ruleRow.ruleId)
+          // setEditStatus(true)
+          UseModal({
+            onOk: function onOk() {},
+            okText: '确定',
+            title: '校验对象已被删除',
+            content: "\u6821\u9A8C\u5BF9\u8C61\u5DF2\u88AB\u5220\u9664\uFF0C\u5C06\u4E0D\u4F1A\u8FDB\u884C\u4F7F\u7528\uFF0C\u8BF7\u8FDB\u884C\u4FEE\u6539"
+          });
+          return;
+        }
+        message.error(res.msg);
       }
-    }).finally(function () {
-      setStatusLoading(false);
     });
   };
+  // 选择近两年数据
+  var disabledDate = function disabledDate(current) {
+    var isAfterToday = current && current > moment().endOf('day');
+    var twoYearsAgo = moment().subtract(2, 'year').startOf('day');
+    var isBeforeTwoYearsAgo = current && current < twoYearsAgo;
+    // 1. 计算上一年的年份（如当前是 2025，则上一年是 2024）
+    var lastYear = moment().year() - 1;
+    // 2. 上一年的时间边界：开始（1月1日 00:00:00）、结束（12月31日 23:59:59）
+    var lastYearStart = moment("".concat(lastYear, "-01-01")).startOf('day'); // 上一年1月1日 00:00
+    return isAfterToday || current < lastYearStart;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(className)
   }, /*#__PURE__*/React.createElement("div", {
@@ -395,7 +476,7 @@ var ClearRule = function ClearRule() {
   }, /*#__PURE__*/React.createElement(Switch, {
     checked: allOpenRule,
     onChange: handleAllOpenStatus
-  }))), authority[170928557418] && (/*#__PURE__*/React.createElement(Button, {
+  }))), authority[170928557418] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DiffOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -403,7 +484,7 @@ var ClearRule = function ClearRule() {
     onClick: function onClick() {
       return setIsModalOpen(true);
     }
-  }, "\u751F\u6210\u62A5\u544A")), authority[170928557417] && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u751F\u6210\u62A5\u544A")), authority[170928557417] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DownloadOutlined, {
       onPointerEnterCapture: undefined,
       onPointerLeaveCapture: undefined
@@ -413,7 +494,7 @@ var ClearRule = function ClearRule() {
     type: "primary",
     onClick: handleAddRule,
     disabled: !authority[170928557411]
-  }, "\u65B0\u5EFA\u89C4\u5219"), authority[170928557415] && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u65B0\u5EFA\u89C4\u5219"), authority[170928557415] && showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setOpenImportModal(true);
@@ -426,6 +507,7 @@ var ClearRule = function ClearRule() {
     onChange: handlePage
   }), addruleShow && (/*#__PURE__*/React.createElement(AddRule, {
     addruleShow: addruleShow,
+    ruleRowView: ruleRowEdit ? true : false,
     currentRuleDetail: editStatus ? ruleDetail : null,
     getList: function getList() {
       return _getList(ruleSearchName);
@@ -457,6 +539,7 @@ var ClearRule = function ClearRule() {
   }, /*#__PURE__*/React.createElement("div", null, "\u9009\u62E9\u65F6\u95F4\u8303\u56F4\u751F\u6210\u62A5\u544A"), /*#__PURE__*/React.createElement(RangePicker, {
     open: true,
     placement: "topRight",
+    disabledDate: disabledDate,
     onChange: handleSelectDate,
     getPopupContainer: function getPopupContainer(trigger) {
       var parent = trigger.parentElement;

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

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

package/es/modules/dataManage/collectionAttributeList.js

@@ -1,10 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -21,7 +21,7 @@ import './styles/index.less';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import { DmContext } from '../../store';
-import { getAppID, getTableScroll } from '../../utils';
+import { getAppID, getTableScroll, ownerWhiteListDataList, eventWhiteList } from '../../utils';
 import CreateAttrDrawer from './components/createAttrDrawer';
 import ImportModal from './components/importAttrDialog';
 import DelConfirm from './components/deleteUserAttrConfirm';
@@ -34,7 +34,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     isDemo = _useContext.isDemo,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var isOpen = props.isOpen,
     queryPlanData = props.queryPlanData,
     source = props.source,
@@ -70,7 +71,9 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var uniqueAttrs = ['name', 'app_user_id'];
   // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
   var rowRenderHandle = function rowRenderHandle(name) {
-    if (source == 'event' && eventAttrsData.owner == 'zg_abp') {
+    if (source == 'event' && ownerWhiteListDataList.find(function (o) {
+      return o == eventAttrsData.attr_name;
+    })) {
       // 内置事件属性
       return false;
     }
@@ -120,10 +123,19 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     if (source == 'user') {
       queryUserPropMeta();
     } else {
+      var ownerEventName = (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name) || '';
       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 (eventWhiteList.includes(ownerEventName) && 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;
@@ -290,7 +302,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          record.category === 'fixed' || record.owner == 'zg_abp',
+          record.newOwner == 'zg_abp' || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -318,7 +330,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           // }
           disabled: isDemo ||
           // !authority[1000004] ||
-          record.category === 'fixed' || record.owner == 'zg_abp',
+          record.newOwner == 'zg_abp' || record.category === 'fixed',
           defaultValue: record.alias_name,
           onFocus: aliasFocus,
           onBlur: function onBlur(e) {
@@ -329,12 +341,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }, {
     title: '数据上报',
-    dataIndex: 'lastInsertTime',
+    dataIndex: 'hasReported',
     width: 100,
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement("div", {
+      return source == 'event' ? (/*#__PURE__*/React.createElement("div", {
         className: "attr-name"
-      }, text ? '有' : '无');
+      }, record.lastInsertTime ? '有' : '无')) : (/*#__PURE__*/React.createElement("div", {
+        className: "attr-name"
+      }, text ? '有' : '无'));
     }
   }, {
     title: '最后上报时间',
@@ -414,7 +428,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.canUpdate || record.category === 'fixed' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -471,7 +485,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' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'hidden');
         },
@@ -533,7 +547,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' || record.newOwner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'encryption_type');
         },
@@ -659,14 +673,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       })
     })),
-    dataIndex: 'owner',
+    dataIndex: 'newOwner',
     width: 120,
-    render: function render(owner) {
+    render: function render(record) {
       var json = {
         zg_abp: '内置',
         zg: '自定义'
       };
-      return /*#__PURE__*/React.createElement("div", null, json[owner]);
+      return /*#__PURE__*/React.createElement("div", null, json[record]);
     }
   }]), [{
     title: '操作',
@@ -678,7 +692,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           padding: 0
         },
-        disabled: source === 'event' ? record.owner == 'zg_abp' || !authority[1000004] : 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('无删除权限');
@@ -912,7 +926,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);
         }
@@ -968,8 +982,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     removeAttrData = _useState34[0],
     setRemoveAttrData = _useState34[1];
   var saveRemoveAttrData = function saveRemoveAttrData(record) {
-    // 新加逻辑--在数据清洗自定义规则中绑定有此原事件不可删除。canDel:false 不允许删除
-    if (!record.canDel) {
+    // // 新加逻辑--在数据清洗自定义规则中绑定有此原事件不可删除。canDel:false 不允许删除
+    if (source == 'event' && !record.canUpdate) {
       UseModal({
         onOk: function onOk() {},
         okText: '确定',
@@ -1132,7 +1146,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   //页面加载完成后才能获取到对应的元素及其位置
   useEffect(function () {
     var _Y = getTableScroll(60, 'dataManageAttrTable');
-    // console.log('_Y', _Y);
     setScrollY(_Y);
   }, []);
   return /*#__PURE__*/React.createElement("div", {
@@ -1171,14 +1184,14 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     onClick: function onClick() {
       return setCreateAttrShow(true);
     }
-  }, "\u521B\u5EFA\u5C5E\u6027"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u521B\u5EFA\u5C5E\u6027"), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "button",
     disabled: isDemo || !authority[1722838544],
     onClick: function onClick() {
       return setOpenImportModal(true);
     }
-  }, "\u5BFC\u5165\u5C5E\u6027")))), /*#__PURE__*/React.createElement(Table, {
+  }, "\u5BFC\u5165\u5C5E\u6027"))))), /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     id: 'dataManageAttrTable',
@@ -1201,7 +1214,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, {
@@ -1233,7 +1246,8 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         name: '',
         aliasName: '',
         type: 1,
-        encryptionType: 0
+        encryptionType: 0,
+        newOwner: 'zg'
       }]));
     }
   }, /*#__PURE__*/React.createElement(IconFont, {