@zgfe/modules-settings 2.1.0-zhongyuan.31 → 2.1.0-zhongyuan.34

package/es/modules/companySetting/application/index.js

@@ -568,8 +568,8 @@ var Application = function Application(_ref) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
             Modal.confirm(_objectSpread(_objectSpread({}, modalConfig), {}, {
-              title: props.status ? '关闭应用' : '开启应用',
-              content: props.status ? '关闭应用后，应用将不再接收数据' : '开启应用后，应用将开始接收数据',
+              title: props.status ? '是否确定关闭应用？' : '开启应用',
+              content: props.status ? '应用关闭期间，所有数据将彻底丢失，且实时数据无法被订阅！请谨慎操作！' : '开启应用后，应用将开始接收数据',
               icon: null,
               onCancel: function onCancel() {},
               onOk: function () {

package/es/modules/pointMap/createMetaDrawer.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _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 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); }); }; }
@@ -92,7 +93,7 @@ var CreateMeta = function CreateMeta(props) {
   };
   var submit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var values;
+      var values, newArr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -120,56 +121,76 @@ var CreateMeta = function CreateMeta(props) {
             });
             return _context.abrupt("return");
           case 11:
+            eventAttrList.forEach(function (o) {
+              o.status = 'error';
+            });
+            newArr = findDuplicateObjects(eventAttrList);
+            if (!(newArr.length > 0)) {
+              _context.next = 16;
+              break;
+            }
+            newArr.forEach(function (o) {
+              o.status = 'error';
+            });
+            return _context.abrupt("return");
+          case 16:
             //把参数传递给主页面
             if (props.onSubmit) {
-              if (props.data) {
-                props.onSubmit({
-                  eventName: values.eventName,
-                  aliasName: values.aliasName,
-                  triggeringOccasion: triTagInput,
-                  businessLabelId: values.businessLabelId,
-                  triggerLabelId: triTagId,
-                  businessLabel: bizTag.filter(function (res) {
-                    return res.value == values.businessLabelId;
-                  })[0],
-                  triggerLabel: triTag.filter(function (res) {
-                    return res.value == triTagId;
-                  })[0],
-                  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.value == values.businessLabelId;
-                  })[0],
-                  triggerLabel: triTag.filter(function (res) {
-                    return res.value == triTagId;
-                  })[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;
+  }
   var dealEventAttr = function dealEventAttr(index) {
     var dealData = _.clone(eventAttrList);
     dealData.splice(index, 1);
@@ -185,10 +206,6 @@ var CreateMeta = function CreateMeta(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     encryption_type = _useState14[0],
     setEncryptionType = _useState14[1];
-  var _useState15 = useState(''),
-    _useState16 = _slicedToArray(_useState15, 2),
-    hasEventName = _useState16[0],
-    setHasEventName = _useState16[1]; // input状态 error|""
   var columns = [{
     title: '序号',
     dataIndex: 'event_name',
@@ -217,20 +234,11 @@ var CreateMeta = function CreateMeta(props) {
         placeholder: '请输入事件属性名',
         value: text,
         showCount: true,
-        status: hasEventName,
+        status: record === null || record === void 0 ? void 0 : record.status,
         maxLength: 128,
         onChange: function onChange(e) {
           setIsChange(true);
           changeItemInfo(index, 'name', e.target.value);
-        },
-        onBlur: function onBlur(e) {
-          if (!e.target.value) return;
-          var valueEventName = e.target.value;
-          var name = eventAttrList.find(function (o) {
-            return o.attr_name == valueEventName;
-          });
-          setHasEventName(name ? 'error' : '');
-          name && message.error('事件名称不能重复');
         }
       }));
     }
@@ -424,10 +432,10 @@ var CreateMeta = function CreateMeta(props) {
       }, "\u5220\u9664");
     }
   });
-  var _useState17 = useState(''),
-    _useState18 = _slicedToArray(_useState17, 2),
-    scrollY = _useState18[0],
-    setScrollY = _useState18[1];
+  var _useState15 = useState(''),
+    _useState16 = _slicedToArray(_useState15, 2),
+    scrollY = _useState16[0],
+    setScrollY = _useState16[1];
   var getTableScroll = function getTableScroll(extraHeight, id) {
     if (typeof extraHeight == 'undefined') {
       //  默认底部分页64 + 边距10
@@ -495,22 +503,22 @@ var CreateMeta = function CreateMeta(props) {
     getEventIdAttrList(event.id);
   };
   //标签列表数据 2:业务标签 3:触发标签
-  var _useState19 = useState([]),
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    bizTag = _useState18[0],
+    setBizTag = _useState18[1];
+  var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    bizTag = _useState20[0],
-    setBizTag = _useState20[1];
-  var _useState21 = useState(),
+    triTagInput = _useState20[0],
+    setTriTagInput = _useState20[1]; // 触发时机
+  var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
-    triTagInput = _useState22[0],
-    setTriTagInput = _useState22[1]; // 触发时机
-  var _useState23 = useState([]),
+    triTag = _useState22[0],
+    setTriTag = _useState22[1];
+  var _useState23 = useState(),
     _useState24 = _slicedToArray(_useState23, 2),
-    triTag = _useState24[0],
-    setTriTag = _useState24[1];
-  var _useState25 = useState(),
-    _useState26 = _slicedToArray(_useState25, 2),
-    triTagId = _useState26[0],
-    setTriTagId = _useState26[1];
+    triTagId = _useState24[0],
+    setTriTagId = _useState24[1];
   var getTagList = function getTagList(type) {
     request(apis.dict.getTagList, {
       method: 'post',
@@ -542,10 +550,10 @@ var CreateMeta = function CreateMeta(props) {
     });
   };
   // 自定义验证规则
-  var _useState27 = useState(''),
-    _useState28 = _slicedToArray(_useState27, 2),
-    inputText = _useState28[0],
-    setInputText = _useState28[1];
+  var _useState25 = useState(''),
+    _useState26 = _slicedToArray(_useState25, 2),
+    inputText = _useState26[0],
+    setInputText = _useState26[1];
   // true 验证通过
   var validateContainsUnderscore = function validateContainsUnderscore(value) {
     if (!isChange) {
@@ -686,6 +694,10 @@ var CreateMeta = function CreateMeta(props) {
     disabled: homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u4E1A\u52A1\u6807\u7B7E",
     options: bizTag,
+    fieldNames: {
+      label: 'labelName',
+      value: 'id'
+    },
     onChange: function onChange() {
       setIsChange(true);
     }
@@ -707,7 +719,8 @@ var CreateMeta = function CreateMeta(props) {
         name: '',
         aliasName: '',
         prop_type: 1,
-        encryption_type: 0
+        encryption_type: 0,
+        status: ''
       }].concat(_toConsumableArray(eventAttrList)));
     }
   }, /*#__PURE__*/React.createElement(IconFont, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.31",
+  "version": "2.1.0-zhongyuan.34",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cb5627b03d5d47677f96da29b749c7892a6940bb",
+  "gitHead": "740ddfdec54e39c6effa346af17b86ee7ccc40a9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }