@zgfe/modules-dm 1.0.56-zhongyuan.27 → 1.0.56-zhongyuan.28

package/es/constants/api.d.ts

@@ -52,6 +52,7 @@ declare let apis: {
     deleteUserPropMeta: string;
     delEventAttr: string;
     addEvent: string;
+    addEventAttr: string;
     uploadEvent: string;
     exportEvent: string;
     companyUsers: string;

package/es/constants/api.js

@@ -101,6 +101,8 @@ var apis = {
   delEventAttr: '/zg/web/v2/event/delEventAttr',
   // 事件新增
   addEvent: '/zg/web/v2/event/addEvent',
+  //事件属性列表新增
+  addEventAttr: '/zg/web/v2/event/addEventAttr',
   // 用户属性-导入
   uploadEvent: '/zg/web/v2/event/upload',
   // 用户属性-导出

package/es/modules/dataManage/collectionAttributeList.js

@@ -15,7 +15,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { BizGlobalDataContext, IconFont, ajax } from '@zgfe/business-lib';
-import { Input, Button, Select, Table, message, Modal, Upload, Popover, Checkbox } from 'antd';
+import { Input, Button, Select, Table, message, Modal, Upload, Popover, Checkbox, notification } from 'antd';
 import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import request from '../../utils/ajax';
@@ -25,6 +25,7 @@ import { getAppID, getTableScroll } from '../../utils';
 import CreateAttrDrawer from './components/createAttrDrawer';
 import ImportModal from './components/importAttrDialog';
 import DelConfirm from './components/deleteUserAttrConfirm';
+import BizEditText from './components/editTxt';
 import _ from 'lodash';
 import moment from 'moment';
 var CollectionAttributeList = function CollectionAttributeList(props) {
@@ -674,11 +675,285 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }, "\u5220\u9664");
     }
   }]);
-  // 删除属性
-  var _useState29 = useState(),
+  // 新增属性
+  var _useState29 = useState(false),
     _useState30 = _slicedToArray(_useState29, 2),
-    removeAttrData = _useState30[0],
-    setRemoveAttrData = _useState30[1];
+    addAttrNameShow = _useState30[0],
+    setAddAttrNameShow = _useState30[1];
+  // 事件内容
+  var _useState31 = useState([]),
+    _useState32 = _slicedToArray(_useState31, 2),
+    eventAttrList = _useState32[0],
+    setEventAttrList = _useState32[1];
+  //新增表格属性
+  var addColumns = [{
+    title: '序号',
+    dataIndex: 'event_name',
+    key: 'event_name',
+    width: 64,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/React.createElement("span", null, index + 1);
+    }
+  }, {
+    title: (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#FB5547',
+        marginRight: 8
+      }
+    }, "*"), "\u4E8B\u4EF6\u5C5E\u6027\u540D\u79F0")),
+    dataIndex: 'name',
+    key: 'name',
+    width: 264,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          margin: '-10px 0'
+        }
+      }, /*#__PURE__*/React.createElement(BizEditText, {
+        value: text,
+        max: 128,
+        placeholder: '请输入事件属性名',
+        onChange: function onChange(e) {
+          // setIsChange(true);
+          changeItemInfo(index, 'name', e);
+        }
+      }));
+    }
+  }, {
+    title: '属性别名',
+    dataIndex: 'aliasName',
+    key: 'aliasName',
+    width: 264,
+    render: function render(aliasName, record, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          margin: '-10px 0'
+        }
+      }, /*#__PURE__*/React.createElement(BizEditText, {
+        value: aliasName,
+        max: 128,
+        placeholder: '请输入属性别名',
+        onChange: function onChange(e) {
+          // setIsChange(true);
+          changeItemInfo(index, 'aliasName', e);
+        }
+      }));
+    }
+  }, {
+    title: (/*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content-select")
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#FB5547',
+        marginRight: 8
+      }
+    }, "*"), /*#__PURE__*/React.createElement(Select, {
+      defaultValue: 0,
+      style: {
+        width: 120,
+        margin: '-10px 0'
+      },
+      onChange: function onChange(e) {
+        return setType(e);
+      },
+      bordered: false,
+      className: "select-style",
+      suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+        type: "xiangxia",
+        style: {
+          color: '#5f6085'
+        }
+      }),
+      // onChange={(e) => props.eventActiveFilter(e, 'event_hidden')}
+      options: [{
+        value: 0,
+        label: '属性类型'
+      }, {
+        value: 1,
+        label: '字符串'
+      }, {
+        value: 2,
+        label: '数值'
+      }, {
+        value: 3,
+        label: '日期'
+      }]
+    }))),
+    dataIndex: 'type',
+    key: 'type',
+    width: 148,
+    render: function render(type, record, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-content-select")
+      }, /*#__PURE__*/React.createElement(Select
+      // defaultValue={record.event_hidden}
+      , {
+        // defaultValue={record.event_hidden}
+        style: {
+          width: 120,
+          margin: '-10px 0'
+        },
+        value: type,
+        suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "xiangxia",
+          style: {
+            color: '#5f6085'
+          }
+        }),
+        // disabled={rowClassNameHandle(record) == 'error-row' || isDemo ? true : false}
+        onChange: function onChange(e) {
+          // setIsChange(true);
+          changeItemInfo(index, 'type', e);
+        },
+        options: [{
+          value: 1,
+          label: '字符串'
+        }, {
+          value: 2,
+          label: '数值'
+        }, {
+          value: 3,
+          label: '日期'
+        }]
+      }));
+    }
+  }, {
+    title: (/*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content-select")
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#FB5547',
+        marginRight: 8
+      }
+    }, "*"), /*#__PURE__*/React.createElement(Select, {
+      defaultValue: -1,
+      bordered: false,
+      onChange: function onChange(e) {
+        return setEncryptionType(e);
+      },
+      style: {
+        width: 120,
+        margin: '-10px 0'
+      },
+      suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+        type: "xiangxia",
+        style: {
+          color: '#5f6085'
+        }
+      }),
+      // onChange={(e) => props.eventActiveFilter(e, 'is_stop')}
+      options: [{
+        value: -1,
+        label: '加密方式'
+      }, {
+        value: 0,
+        label: '不加密'
+      }, {
+        value: 1,
+        label: '半加密'
+      }, {
+        value: 2,
+        label: '全加密'
+      }]
+    }))),
+    dataIndex: 'encryptionType',
+    key: 'encryptionType',
+    width: 148,
+    render: function render(encryptionType, record, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-content-select")
+      }, /*#__PURE__*/React.createElement(Select, {
+        value: encryptionType,
+        style: {
+          width: 120,
+          margin: '-10px 0'
+        },
+        suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+          type: "xiangxia",
+          style: {
+            color: '#5f6085'
+          }
+        }),
+        // disabled={rowClassNameHandle(record) == 'error-row' || isDemo ? true : false}
+        onChange: function onChange(e) {
+          // setIsChange(true);
+          changeItemInfo(index, 'encryptionType', e);
+        },
+        options: [{
+          value: 0,
+          label: '不加密'
+        }, {
+          value: 1,
+          label: '半加密'
+        }, {
+          value: 2,
+          label: '全加密'
+        }]
+      }));
+    }
+  }, {
+    title: '操作',
+    dataIndex: 'set',
+    key: 'set',
+    width: 64,
+    render: function render(_, record, index) {
+      return /*#__PURE__*/React.createElement("a", {
+        className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
+        onClick: function onClick() {
+          return dealEventAttr(index);
+        }
+      }, "\u5220\u9664");
+    }
+  }];
+  // 删除新增属性
+  var dealEventAttr = function dealEventAttr(index) {
+    var dealData = _.clone(eventAttrList);
+    dealData.splice(index, 1);
+    setEventAttrList(dealData);
+  };
+  var changeItemInfo = function changeItemInfo(i, key, v) {
+    var dealData = _.clone(eventAttrList);
+    dealData[i][key] = v;
+    setEventAttrList(dealData);
+  };
+  //新增事件属性
+  var addAttrNameEdit = function addAttrNameEdit() {
+    if (eventAttrList.filter(function (item) {
+      return !item.name;
+    }).length) {
+      notification.warning({
+        message: '请输入事件属性名称'
+      });
+      return;
+    }
+    request(apis.addEventAttr, {
+      method: 'POST',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        eventId: eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id,
+        eventAttrList: eventAttrList
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
+        notification.success({
+          message: '添加成功'
+        });
+        //重新获取列表
+        queryUserPropMeta();
+        setAddAttrNameShow(false);
+      } else {
+        notification.error({
+          message: '添加失败'
+        });
+      }
+    });
+    // setAddAttrNameShow(false);
+  };
+  // 删除属性
+  var _useState33 = useState(),
+    _useState34 = _slicedToArray(_useState33, 2),
+    removeAttrData = _useState34[0],
+    setRemoveAttrData = _useState34[1];
   var saveRemoveAttrData = function saveRemoveAttrData(record) {
     if (isDemo) {
       message.error('demo环境，无法删除');
@@ -715,26 +990,26 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     title: '属性值别名',
     dataIndex: 'mapping_value'
   }];
-  var _useState31 = useState([]),
-    _useState32 = _slicedToArray(_useState31, 2),
-    attrExcelData = _useState32[0],
-    setAttrExcelData = _useState32[1];
-  var _useState33 = useState(false),
-    _useState34 = _slicedToArray(_useState33, 2),
-    attrAliasNameShow = _useState34[0],
-    setAttrAliasNameShow = _useState34[1];
-  var _useState35 = useState(0),
+  var _useState35 = useState([]),
     _useState36 = _slicedToArray(_useState35, 2),
-    attrId = _useState36[0],
-    setattrId = _useState36[1];
-  var _useState37 = useState(0),
+    attrExcelData = _useState36[0],
+    setAttrExcelData = _useState36[1];
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    batchId = _useState38[0],
-    setBatchId = _useState38[1];
-  var _useState39 = useState(false),
+    attrAliasNameShow = _useState38[0],
+    setAttrAliasNameShow = _useState38[1];
+  var _useState39 = useState(0),
     _useState40 = _slicedToArray(_useState39, 2),
-    exportAliasTmp = _useState40[0],
-    setExportAliasTmp = _useState40[1];
+    attrId = _useState40[0],
+    setattrId = _useState40[1];
+  var _useState41 = useState(0),
+    _useState42 = _slicedToArray(_useState41, 2),
+    batchId = _useState42[0],
+    setBatchId = _useState42[1];
+  var _useState43 = useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    exportAliasTmp = _useState44[0],
+    setExportAliasTmp = _useState44[1];
   var uploadProps = {
     maxCount: 1,
     showUploadList: false,
@@ -764,10 +1039,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   };
   // 清空属性值别名excel数据
-  var _useState41 = useState(false),
-    _useState42 = _slicedToArray(_useState41, 2),
-    clearFlag = _useState42[0],
-    setClearFlag = _useState42[1];
+  var _useState45 = useState(false),
+    _useState46 = _slicedToArray(_useState45, 2),
+    clearFlag = _useState46[0],
+    setClearFlag = _useState46[1];
   var clearData = function clearData() {
     setAttrExcelData([]);
     setClearFlag(true);
@@ -824,12 +1099,13 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     setAttrAliasNameShow(false);
     setClearFlag(false);
     setValueLoading(false);
+    setAddAttrNameShow(false);
     setAttrExcelData([]);
   };
-  var _useState43 = useState(''),
-    _useState44 = _slicedToArray(_useState43, 2),
-    scrollY = _useState44[0],
-    setScrollY = _useState44[1];
+  var _useState47 = useState(''),
+    _useState48 = _slicedToArray(_useState47, 2),
+    scrollY = _useState48[0],
+    setScrollY = _useState48[1];
   //页面加载完成后才能获取到对应的元素及其位置
   useEffect(function () {
     var _Y = getTableScroll(60, 'dataManageAttrTable');
@@ -905,7 +1181,60 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       return owner == '' || item.owner === owner;
     }),
     pagination: false
-  }), /*#__PURE__*/React.createElement(Modal, {
+  }), /*#__PURE__*/React.createElement(Button, {
+    className: "button-add",
+    type: "primary",
+    onClick: function onClick() {
+      setAddAttrNameShow(true);
+      setEventAttrList([]); // 清空新增事件属性
+    }
+  }, "\u65B0\u589E\u4E8B\u4EF6\u5C5E\u6027"), /*#__PURE__*/React.createElement(Modal, {
+    width: "80%",
+    title: "\u65B0\u589E\u4E8B\u4EF6\u5C5E\u6027",
+    getContainer: false,
+    open: addAttrNameShow,
+    onOk: addAttrNameEdit,
+    onCancel: closeHandle
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-info"),
+    style: {
+      marginBottom: 15
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-info-input")
+  }, /*#__PURE__*/React.createElement(Button, {
+    shape: "round",
+    className: "button",
+    onClick: function onClick() {
+      setEventAttrList([].concat(_toConsumableArray(eventAttrList), [{
+        name: '',
+        aliasName: '',
+        type: 1,
+        encryptionType: 0
+      }]));
+    }
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "tianjia1",
+    style: {
+      marginRight: 8,
+      marginBottom: 15
+    }
+  }), "\u6DFB\u52A0\u4E8B\u4EF6\u5C5E\u6027"))), /*#__PURE__*/React.createElement(Table, {
+    className: "".concat(classPrefix, "-table"),
+    id: "dataManageCreateMetaTable",
+    columns: addColumns,
+    rowKey: "key",
+    dataSource: eventAttrList.filter(function (item) {
+      return type < 1 || item.type === type;
+    }).filter(function (item) {
+      return encryption_type < 0 || item.encryption_type === encryption_type;
+    }),
+    scroll: {
+      y: 'calc(100vh - 400px)'
+    },
+    pagination: false,
+    sticky: true
+  })), /*#__PURE__*/React.createElement(Modal, {
     title: "\u5C5E\u6027\u503C\u522B\u540D",
     getContainer: false,
     open: attrAliasNameShow,