@zgfe/modules-settings 2.1.0-zhongyuan.7 → 2.1.0-zhongyuan.8

package/es/modules/pointMap/createMetaDrawer.js

@@ -126,34 +126,18 @@ var CreateMeta = function CreateMeta(props) {
                   eventName: values.eventName,
                   aliasName: values.aliasName,
                   triggeringOccasion: triTagInput,
-                  del: 1,
                   eventAttrList: eventAttrList,
                   businessLabelId: values.businessLabelId,
-                  triggerLabelId: triTagId
+                  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');
               }
             }
-            // request<any>(apis.createEvent, {
-            //   method: 'POST',
-            //   data: {
-            //     app_id: currentApp?.appId,
-            //     eventName: values.eventName,
-            //     aliasName: values.aliasName,
-            //     triggeringOccasion: values.triggeringOccasion,
-            //     eventAttrList,
-            //   },
-            // }).then((res) => {
-            //   if (res?.code === '100000') {
-            //     notification.success({
-            //       message: '保存成功',
-            //     });
-            //     props.onSubmit && props.onSubmit();
-            //   } else {
-            //     notification.error({
-            //       message: '保存失败',
-            //     });
-            //   }
-            // });
             _context.next = 17;
             break;
           case 14:
@@ -557,7 +541,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      businessLabelId: '',
+      businessLabelId: undefined,
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {

package/es/modules/pointMap/pageInfo.js

@@ -532,7 +532,7 @@ var PageInfo = function PageInfo(props) {
       }, record.triggerLabel.labelName)));
       return /*#__PURE__*/React.createElement(Popover, {
         content: content,
-        title: sliceName(eventName) || ''
+        title: sliceName(record) || ''
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           if (!isSelect) {
@@ -886,20 +886,16 @@ var PageInfo = function PageInfo(props) {
   //设置新添加的元事件
   var onEventSet = function onEventSet(data, type) {
     if (type == 'create') {
-      setEventAttrList([{
-        eventName: data.eventName,
-        triggeringOccasion: data.triggeringOccasion,
-        aliasName: data.aliasName,
+      setEventAttrList([_objectSpread(_objectSpread({}, data), {}, {
         describe: '',
         pointSelect: undefined,
         imgPath: '',
         index: eventAttrList.length,
         key: new Date() * 1,
-        eventAttrList: data.eventAttrList,
         pageName: pageName,
         pageId: id,
         pageImgUrl: imgPath
-      }].concat(_toConsumableArray(eventAttrList)));
+      })].concat(_toConsumableArray(eventAttrList)));
       setShowIndex(eventAttrList.length);
       setTimeout(function () {
         setShowIndex(void 0);
@@ -920,7 +916,7 @@ var PageInfo = function PageInfo(props) {
   //拼接名称
   var sliceName = function sliceName(record) {
     var _record$businessLabel, _record$triggerLabel;
-    var point = record.labels && record.labels.filter(function (res) {
+    var point = props.pageData.labels && props.pageData.labels.filter(function (res) {
       return res.labelType == 1;
     }).map(function (res) {
       return res.labelName;
@@ -1191,7 +1187,7 @@ var PageInfo = function PageInfo(props) {
     isEdit: true,
     onSubmit: function onSubmit(event, type) {
       setCreateMetaShow(false);
-      console.log(event, '事件内容');
+      // console.log(event, '事件内容');
       onEventSet(event, type);
     },
     // selectTreeName={props.selectTreeName}

package/es/modules/pointMap/styles/index.less

@@ -158,4 +158,8 @@
     display: flex;
     align-items: center;
   }
+  .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
+    color: #021429;
+    background-color: #f2f3f4;
+  }
 }

package/es/modules/pointMap/tree.js

@@ -457,7 +457,7 @@ var pointMap = function pointMap(props) {
       }
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-tree-item-title-name")
-    }, nodeData.name, " ", nodeData.pointSum ? "(".concat(nodeData.pointSum, ")") : ''), /*#__PURE__*/React.createElement(Popover, {
+    }, nodeData.name, " (", nodeData.pointSum || 0, ")"), /*#__PURE__*/React.createElement(Popover, {
       placement: "topLeft",
       title: "\u4F4D\u7F6E\u6807\u7B7E",
       content: pointContent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.7",
+  "version": "2.1.0-zhongyuan.8",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "47cbe999df717a272a641007018239d5b7270922",
+  "gitHead": "1756aba61064e28b66ad537e900d35c18c2e3f57",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }