@zgfe/modules-settings 2.1.0-zhongyuan.8 → 3.0.0-zhongyuan-set.0

package/es/modules/pointMap/createMetaDrawer.js

@@ -1,16 +1,17 @@
 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-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); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 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); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -68,6 +69,11 @@ var CreateMeta = function CreateMeta(props) {
         setHomeType(props.isEdit ? 'update' : 'get');
         initData(props.data);
       } else {
+        form.resetFields(); // 重置表单数据
+        setEventAttrList([]);
+        setTriTagInput(undefined);
+        setTriTagId(undefined);
+        setInputText('');
         setHomeType('create');
       }
     }
@@ -82,12 +88,18 @@ var CreateMeta = function CreateMeta(props) {
     setTriTagId(data.triggerLabelId);
     setInputText(data.eventName);
     if (data.eventAttrList) {
-      setEventAttrList(_toConsumableArray(data.eventAttrList));
+      var arr = data.eventAttrList.map(function (o) {
+        return _objectSpread(_objectSpread({}, o), {}, {
+          prop_type: o.type,
+          encryption_type: o.encryptionType
+        });
+      });
+      setEventAttrList(_toConsumableArray(arr));
     }
   };
   var submit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var values;
+      var values, resultArr, newArr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -115,45 +127,84 @@ var CreateMeta = function CreateMeta(props) {
             });
             return _context.abrupt("return");
           case 11:
+            // 先初始没有错误
+            resultArr = [];
+            newArr = findDuplicateObjects(eventAttrList);
+            if (!(newArr.length >= 1)) {
+              _context.next = 16;
+              break;
+            }
+            notification.warning({
+              message: '有事件属性名称相同'
+            });
+            // resultArr = eventAttrList.map((j) => {
+            //   if (newArr.find((k) => j.name == k)) {
+            //     return { ...j, status: 'error' };
+            //   }
+            //   return j;
+            // });
+            // setEventAttrList(resultArr);
+            return _context.abrupt("return");
+          case 16:
             //把参数传递给主页面
             if (props.onSubmit) {
-              if (props.data) {
-                props.onSubmit(_objectSpread(_objectSpread({}, props.data), {}, {
-                  eventAttrList: eventAttrList
-                }), 'update');
-              } else {
-                props.onSubmit({
-                  eventName: values.eventName,
-                  aliasName: values.aliasName,
-                  triggeringOccasion: triTagInput,
-                  eventAttrList: eventAttrList,
-                  businessLabelId: values.businessLabelId,
-                  triggerLabelId: triTagId,
-                  businessLabel: bizTag.filter(function (res) {
-                    return res.id == values.businessLabelId;
-                  })[0],
-                  triggerLabel: triTag.filter(function (res) {
-                    return res.id == values.businessLabelId;
-                  })[0]
-                }, 'create');
-              }
+              props.onSubmit({
+                eventName: values.eventName,
+                aliasName: values.aliasName,
+                triggeringOccasion: triTagInput,
+                businessLabelId: values.businessLabelId,
+                triggerLabelId: triTagId,
+                businessLabel: values.businessLabelId && bizTag.filter(function (res) {
+                  return res.id == values.businessLabelId;
+                })[0],
+                triggerLabel: triTagId && triTag.filter(function (res) {
+                  return res.id == triTagId;
+                })[0],
+                eventAttrList: eventAttrList
+              }, props.data ? 'update' : 'create');
             }
-            _context.next = 17;
+            _context.next = 22;
             break;
-          case 14:
-            _context.prev = 14;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](1);
             console.log('表单验证失败:', _context.t0);
-          case 17:
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 14]]);
+      }, _callee, null, [[1, 19]]);
     }));
     return function submit() {
       return _ref.apply(this, arguments);
     };
   }();
+  function findDuplicateObjects(arr) {
+    var map = new Map(); // key: name值, value: 对应的对象
+    var duplicates = [];
+    var _iterator = _createForOfIteratorHelper(arr),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var obj = _step.value;
+        var name = obj.name || obj.attr_name;
+        if (map.has(name)) {
+          // 找到重复项，把已存的对象和当前对象加入结果
+          duplicates.push(map.get(name), obj);
+          break; // 只找第一组重复项，如需全部可去掉break
+        } else {
+          map.set(name, obj);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return duplicates.map(function (o) {
+      return o.name;
+    });
+  }
   var dealEventAttr = function dealEventAttr(index) {
     var dealData = _.clone(eventAttrList);
     dealData.splice(index, 1);
@@ -192,14 +243,16 @@ var CreateMeta = function CreateMeta(props) {
         style: {
           margin: '-10px 0'
         }
-      }, /*#__PURE__*/React.createElement(BizEditText, {
-        canEdit: homeType != 'get',
-        value: text,
-        max: 128,
+      }, /*#__PURE__*/React.createElement(Input, {
+        disabled: homeType == 'get',
         placeholder: '请输入事件属性名',
+        value: text,
+        showCount: true,
+        status: record === null || record === void 0 ? void 0 : record.status,
+        maxLength: 128,
         onChange: function onChange(e) {
           setIsChange(true);
-          changeItemInfo(index, 'name', e);
+          changeItemInfo(index, 'name', e.target.value);
         }
       }));
     }
@@ -265,10 +318,10 @@ var CreateMeta = function CreateMeta(props) {
         label: '日期'
       }]
     }))),
-    dataIndex: 'type',
-    key: 'type',
+    dataIndex: 'prop_type',
+    key: 'prop_type',
     width: 148,
-    render: function render(type, record, index) {
+    render: function render(prop_type, record, index) {
       return /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-select")
       }, /*#__PURE__*/React.createElement(Select
@@ -279,7 +332,7 @@ var CreateMeta = function CreateMeta(props) {
           width: 120,
           margin: '-10px 0'
         },
-        value: type,
+        value: prop_type,
         suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
           type: "xiangxia",
           style: {
@@ -289,6 +342,7 @@ var CreateMeta = function CreateMeta(props) {
         disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
+          changeItemInfo(index, 'prop_type', e);
           changeItemInfo(index, 'type', e);
         },
         options: [{
@@ -343,14 +397,14 @@ var CreateMeta = function CreateMeta(props) {
         label: '全加密'
       }]
     }))),
-    dataIndex: 'encryptionType',
-    key: 'encryptionType',
+    dataIndex: 'encryption_type',
+    key: 'encryption_type',
     width: 148,
-    render: function render(encryptionType, record, index) {
+    render: function render(encryption_type, record, index) {
       return /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-select")
       }, /*#__PURE__*/React.createElement(Select, {
-        value: encryptionType,
+        value: encryption_type,
         style: {
           width: 120,
           margin: '-10px 0'
@@ -364,6 +418,7 @@ var CreateMeta = function CreateMeta(props) {
         disabled: homeType == 'get',
         onChange: function onChange(e) {
           setIsChange(true);
+          changeItemInfo(index, 'encryption_type', e);
           changeItemInfo(index, 'encryptionType', e);
         },
         options: [{
@@ -435,8 +490,33 @@ var CreateMeta = function CreateMeta(props) {
   };
   // 是否复制的开关
   var changeSwitch = function changeSwitch(event) {
+    // 清空其他数据
+    form.resetFields(); // 重置表单数据
+    setEventAttrList([]);
+    setTriTagInput(undefined);
+    setTriTagId(undefined);
+    setInputText('');
     setIsCopy(event);
   };
+  // 根据事件id获取属性列表
+  function getEventIdAttrList(id) {
+    request(apis.getEventAttributes, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        eventId: id
+      }
+    }).then(function (res) {
+      setEventAttrList(_toConsumableArray(res.data.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          aliasName: item.alias_name,
+          name: item.attr_name,
+          type: item.prop_type,
+          encryptionType: item.encryption_type
+        });
+      })));
+    });
+  }
   var onChangeEvent = function onChangeEvent(_ref2) {
     var event = _ref2.event;
     form.setFieldsValue({
@@ -444,14 +524,7 @@ var CreateMeta = function CreateMeta(props) {
       eventName: event.name
     });
     setInputText(event.name);
-    if (event.attrList) {
-      setEventAttrList(_toConsumableArray(event.attrList.map(function (res) {
-        return _objectSpread(_objectSpread({}, res), {}, {
-          aliasName: res.alias,
-          name: res.label
-        });
-      })));
-    }
+    getEventIdAttrList(event.id);
   };
   //标签列表数据 2:业务标签 3:触发标签
   var _useState17 = useState([]),
@@ -461,7 +534,7 @@ var CreateMeta = function CreateMeta(props) {
   var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
     triTagInput = _useState20[0],
-    setTriTagInput = _useState20[1];
+    setTriTagInput = _useState20[1]; // 触发时机
   var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
     triTag = _useState22[0],
@@ -478,21 +551,21 @@ var CreateMeta = function CreateMeta(props) {
         labelType: type
       }
     }).then(function (res) {
-      if (res.code == '100000') {
+      if (res && res.code == '100000') {
         switch (type) {
           case 2:
             setBizTag(res.data.map(function (res) {
               return {
-                label: res.labelName,
-                value: res.id
+                labelName: res.labelName,
+                id: res.id
               };
             }));
             break;
           case 3:
             setTriTag(res.data.map(function (res) {
               return {
-                label: res.labelName,
-                value: res.id
+                labelName: res.labelName,
+                id: res.id
               };
             }));
             break;
@@ -541,7 +614,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      businessLabelId: undefined,
+      businessLabelId: triTagId || undefined,
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {
@@ -565,8 +638,12 @@ var CreateMeta = function CreateMeta(props) {
     }],
     validateStatus: validateContainsUnderscore(inputText) ? '' : 'error',
     help: validateContainsUnderscore(inputText) ? '' : inputText == '' ? '请输入事件名称' : "\u8BF7\u6839\u636E\u9875\u9762\u5C42\u7EA7\u547D\u540D\uFF0C\u5982\uFF1A".concat(props.selectTreeName)
-  }, isCopy ? (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showAllEvent: true,
+  }, isCopy ? (/*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(BizEventSelector, {
+    showAllEvent: false,
     multiple: false,
     key: "eventProp",
     showBuiltInTarget: false,
@@ -587,7 +664,7 @@ var CreateMeta = function CreateMeta(props) {
     name: "aliasName",
     label: "\u4E8B\u4EF6\u522B\u540D"
   }, /*#__PURE__*/React.createElement(Input, {
-    disabled: homeType == 'update' || homeType == 'get',
+    disabled: homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u522B\u540D",
     showCount: true,
     maxLength: 128,
@@ -604,23 +681,29 @@ var CreateMeta = function CreateMeta(props) {
       width: '160px',
       marginRight: '10px'
     },
-    disabled: homeType == 'update' || homeType == 'get',
+    disabled: homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
-    defaultValue: triTagId,
+    // defaultValue={triTagId}
+    value: triTagId,
     options: triTag,
+    fieldNames: {
+      label: 'labelName',
+      value: 'id'
+    },
     onChange: function onChange(value) {
       setTriTagId(value);
       setIsChange(true);
     }
   }), "\u6216", /*#__PURE__*/React.createElement(Input, {
-    disabled: homeType == 'update' || homeType == 'get',
+    disabled: homeType == 'get',
     style: {
       border: 0,
       width: 'calc(100% - 195px)',
       marginLeft: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A\uFF0C\u4F8B\u5982\uFF1A\u7528\u6237\u70B9\u51FB\u786E\u8BA4\u6309\u94AE",
-    defaultValue: triTagInput,
+    // defaultValue={triTagInput}
+    value: triTagInput,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
@@ -632,9 +715,13 @@ var CreateMeta = function CreateMeta(props) {
     label: "\u4E1A\u52A1\u6807\u7B7E"
   }, /*#__PURE__*/React.createElement(Select, {
     allowClear: true,
-    disabled: homeType == 'update' || homeType == 'get',
+    disabled: homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u4E1A\u52A1\u6807\u7B7E",
     options: bizTag,
+    fieldNames: {
+      label: 'labelName',
+      value: 'id'
+    },
     onChange: function onChange() {
       setIsChange(true);
     }
@@ -652,12 +739,16 @@ var CreateMeta = function CreateMeta(props) {
     className: "button",
     onClick: function onClick() {
       // setIsChange(true);
-      setEventAttrList([].concat(_toConsumableArray(eventAttrList), [{
+      setEventAttrList([{
         name: '',
         aliasName: '',
+        prop_type: 1,
+        encryptionType: 0,
+        encryption_type: 0,
         type: 1,
-        encryptionType: 0
-      }]));
+        status: '',
+        key: eventAttrList.length + 1
+      }].concat(_toConsumableArray(eventAttrList)));
     }
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tianjia1",

package/es/modules/pointMap/index.js

@@ -92,7 +92,9 @@ var pointMap = function pointMap(props) {
     pageStatusIsEdit: pageStatusIsEdit,
     onChangePage: function onChangePage(data) {
       setPageData(data);
-      props.setTreeData && props.setTreeData(data.treeName + '_点击'); // 树选择发生变化元事件名称一起变化
+      if (data) {
+        props.setTreeData && props.setTreeData(data.treeName + '_点击'); // 树选择发生变化元事件名称一起变化
+      }
     },
     refreshPage: function refreshPage() {
       return setKey(new Date().getTime());

package/es/modules/pointMap/pageInfo.js

@@ -168,7 +168,6 @@ var PageInfo = function PageInfo(props) {
     recordShow = _useState52[0],
     setRecordShow = _useState52[1];
   useEffect(function () {
-    // console.log('props.pageData', props.pageData);
     if (!props.pageData) {
       setIsEmpty(true);
     } else {
@@ -176,7 +175,6 @@ var PageInfo = function PageInfo(props) {
     }
   }, [props.pageData, props.refreshKey]);
   useEffect(function () {
-    // console.log('props.pageData', props.pageData);
     props.onChangePageStatus && props.onChangePageStatus(isEdit);
   }, [isEdit]);
   var getPageConfig = function getPageConfig() {
@@ -252,6 +250,12 @@ var PageInfo = function PageInfo(props) {
       });
       return;
     }
+    if (!imgUrl) {
+      notification.warning({
+        message: '请选择页面图示'
+      });
+      return;
+    }
     if (eventAttrList.filter(function (item) {
       return !item.eventId;
     }).length) {
@@ -291,6 +295,7 @@ var PageInfo = function PageInfo(props) {
             id: id,
             pageName: pageName,
             imgUrl: imgUrl,
+            pageId: props.pageData.id,
             describe: describe
           }
         }).then(function (res) {
@@ -902,9 +907,7 @@ var PageInfo = function PageInfo(props) {
       }, 3000);
     } else {
       setEventAttrList(eventAttrList.map(function (res, index) {
-        return metaDataIndex == index ? _objectSpread(_objectSpread({}, res), {}, {
-          eventAttrList: data.eventAttrList
-        }) : res;
+        return metaDataIndex == index ? _objectSpread(_objectSpread({}, res), data) : res;
       }));
     }
   };
@@ -916,13 +919,13 @@ var PageInfo = function PageInfo(props) {
   //拼接名称
   var sliceName = function sliceName(record) {
     var _record$businessLabel, _record$triggerLabel;
-    var point = props.pageData.labels && props.pageData.labels.filter(function (res) {
+    var point = props.pageData && props.pageData.labels && props.pageData.labels.filter(function (res) {
       return res.labelType == 1;
     }).map(function (res) {
-      return res.labelName;
+      return res.labelName || res.label;
     }).join('_') || '';
-    var biz = record.businessLabel && ((_record$businessLabel = record.businessLabel) === null || _record$businessLabel === void 0 ? void 0 : _record$businessLabel.labelName) || '';
-    var trig = record.triggerLabel && ((_record$triggerLabel = record.triggerLabel) === null || _record$triggerLabel === void 0 ? void 0 : _record$triggerLabel.labelName) || '' || '';
+    var biz = (record === null || record === void 0 ? void 0 : record.businessLabel) && ((_record$businessLabel = record.businessLabel) === null || _record$businessLabel === void 0 ? void 0 : _record$businessLabel.labelName) || '';
+    var trig = (record === null || record === void 0 ? void 0 : record.triggerLabel) && ((_record$triggerLabel = record.triggerLabel) === null || _record$triggerLabel === void 0 ? void 0 : _record$triggerLabel.labelName) || '' || '';
     var arr = [biz, point, trig, record.eventName].filter(function (res) {
       return res;
     }).join('-');
@@ -1008,7 +1011,11 @@ var PageInfo = function PageInfo(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-title")
-  }, "\u9875\u9762\u56FE\u793A"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: '#FB5547'
+    }
+  }, "*"), "\u9875\u9762\u56FE\u793A"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-input")
   }, !imgPath ? (/*#__PURE__*/React.createElement(Upload, _objectSpread({}, uploadProps), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-upload")