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

package/es/modules/pointMap/createMetaDrawer.js

@@ -76,8 +76,10 @@ var CreateMeta = function CreateMeta(props) {
     form.setFieldsValue({
       aliasName: data.aliasName,
       eventName: data.eventName,
-      triggeringOccasion: data.triggeringOccasion
+      businessLabelId: data.businessLabelId
     });
+    setTriTagInput(data.triggeringOccasion);
+    setTriTagId(data.triggerLabelId);
     setInputText(data.eventName);
     if (data.eventAttrList) {
       setEventAttrList(_toConsumableArray(data.eventAttrList));
@@ -113,7 +115,7 @@ var CreateMeta = function CreateMeta(props) {
             });
             return _context.abrupt("return");
           case 11:
-            //吧参数传递给主页面
+            //把参数传递给主页面
             if (props.onSubmit) {
               if (props.data) {
                 props.onSubmit(_objectSpread(_objectSpread({}, props.data), {}, {
@@ -123,34 +125,19 @@ var CreateMeta = function CreateMeta(props) {
                 props.onSubmit({
                   eventName: values.eventName,
                   aliasName: values.aliasName,
-                  triggeringOccasion: values.triggeringOccasion,
-                  del: 1,
+                  triggeringOccasion: triTagInput,
                   eventAttrList: eventAttrList,
-                  bizTagId: bizTagId
+                  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');
               }
             }
-            // 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:
@@ -473,8 +460,8 @@ var CreateMeta = function CreateMeta(props) {
     setBizTag = _useState18[1];
   var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    bizTagId = _useState20[0],
-    setBizTagId = _useState20[1];
+    triTagInput = _useState20[0],
+    setTriTagInput = _useState20[1];
   var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
     triTag = _useState22[0],
@@ -496,7 +483,7 @@ var CreateMeta = function CreateMeta(props) {
           case 2:
             setBizTag(res.data.map(function (res) {
               return {
-                label: res.name,
+                label: res.labelName,
                 value: res.id
               };
             }));
@@ -504,7 +491,7 @@ var CreateMeta = function CreateMeta(props) {
           case 3:
             setTriTag(res.data.map(function (res) {
               return {
-                label: res.name,
+                label: res.labelName,
                 value: res.id
               };
             }));
@@ -554,7 +541,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      triggeringOccasion: '',
+      businessLabelId: undefined,
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {
@@ -619,9 +606,10 @@ var CreateMeta = function CreateMeta(props) {
     },
     disabled: homeType == 'update' || homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
+    defaultValue: triTagId,
     options: triTag,
     onChange: function onChange(value) {
-      setBizTagId(value);
+      setTriTagId(value);
       setIsChange(true);
     }
   }), "\u6216", /*#__PURE__*/React.createElement(Input, {
@@ -632,9 +620,11 @@ var CreateMeta = function CreateMeta(props) {
       marginLeft: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A\uFF0C\u4F8B\u5982\uFF1A\u7528\u6237\u70B9\u51FB\u786E\u8BA4\u6309\u94AE",
+    defaultValue: triTagInput,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
+      setTriTagInput(e.target.value);
       setIsChange(true);
     }
   })), /*#__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,6 +1187,7 @@ var PageInfo = function PageInfo(props) {
     isEdit: true,
     onSubmit: function onSubmit(event, type) {
       setCreateMetaShow(false);
+      // console.log(event, '事件内容');
       onEventSet(event, type);
     },
     // selectTreeName={props.selectTreeName}

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

@@ -1,157 +1,165 @@
-.setting-point-map {
-  display: flex;
-  flex-direction: row;
-  gap: 16px;
-  width: 100%;
-  height: 100%;
-  padding: 16px;
-  background-color: #fafafb;
-  &-left {
-    position: relative;
-    min-width: 350px;
-    max-width: 600px;
-    &-drag {
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 6px;
-      height: 100%;
-      border-right: 2px solid transparent;
-      cursor: ew-resize;
-    }
-  }
-  &-right {
-    flex: 1;
-    overflow: hidden;
-  }
-  .setting-point-map-page-content-img-select {
-    position: relative;
-  }
-  .ant-image {
-    position: static;
-  }
-  .ant-image .ant-image-mask {
-    color: #fff;
-    font-size: 24px;
-    background: rgba(2, 20, 41, 0.5) !important;
-  }
-  &-addListBtn {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-}
-
-.setting-create-meta-drawer {
-  .set:hover {
-    color: #ff4d4f;
-  }
-  &-content {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    gap: 24px;
-    &-select {
-      display: flex;
-      align-items: center;
-      justify-content: right;
-      margin-right: -12px;
-      margin-left: -16px;
-    }
-    .ant-table-thead > tr > th {
-      color: var(--io-N-, #021429);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: 'PingFang SC';
-      font-style: normal;
-      line-height: normal;
-    }
-  }
-  &-table {
-    margin: 20px 0px;
-    overflow: hidden;
-    border-radius: 8px;
-  }
-
-  &-info {
-    display: flex;
-    flex-direction: row;
-    gap: 12px;
-    align-items: center;
-    height: 32px;
-    &-title {
-      display: flex;
-      flex-direction: row;
-      gap: 4px;
-      justify-content: flex-end;
-      width: 68px;
-      color: var(--io-N6-, #67727f);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: 'PingFang SC';
-      font-style: normal;
-      line-height: 32px;
-      line-height: normal;
-      text-align: right;
-    }
-    &-input {
-      position: relative;
-      flex: 1;
-      .button:not(.disabled):not(.ant-btn-primary) {
-        float: right;
-        padding: 0 16px;
-        color: #1454e5;
-        border: 1px solid #1454e5;
-      }
-      &-num {
-        position: absolute;
-        top: 6px;
-        right: 12px;
-        color: var(--io-N4-, #9aa1a9);
-        font-weight: 400;
-        font-size: 14px;
-        font-family: 'PingFang SC';
-        font-style: normal;
-        line-height: 20px;
-      }
-    }
-  }
-
-  &-footer {
-    display: flex;
-    gap: 16px;
-    align-items: center;
-    justify-content: flex-end;
-    margin: 0 -24px -24px;
-    padding: 18px 24px 18px 0px;
-    background: #fff;
-    border-top: 1px solid var(--io-N1-, #e6e7ea);
-  }
-  .ant-drawer-content-wrapper {
-    overflow-x: hidden;
-  }
-  .ant-drawer-content,
-  .ant-drawer-wrapper-body {
-    overflow: hidden !important;
-  }
-  .ant-drawer-body {
-    display: flex;
-    flex-direction: column;
-  }
-  .ant-drawer-title {
-    span {
-      margin-left: 8px;
-      color: #9aa1a9;
-      font-size: 12px;
-    }
-  }
-  .ant-drawer-close {
-    display: none;
-  }
-  .ant-drawer-extra {
-    .qingchu {
-      font-size: 20px !important;
-      cursor: pointer;
-    }
-  }
-}
+.setting-point-map {
+  display: flex;
+  flex-direction: row;
+  gap: 16px;
+  width: 100%;
+  height: 100%;
+  padding: 16px;
+  background-color: #fafafb;
+  &-left {
+    position: relative;
+    min-width: 350px;
+    max-width: 600px;
+    &-drag {
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 6px;
+      height: 100%;
+      border-right: 2px solid transparent;
+      cursor: ew-resize;
+    }
+  }
+  &-right {
+    flex: 1;
+    overflow: hidden;
+  }
+  .setting-point-map-page-content-img-select {
+    position: relative;
+  }
+  .ant-image {
+    position: static;
+  }
+  .ant-image .ant-image-mask {
+    color: #fff;
+    font-size: 24px;
+    background: rgba(2, 20, 41, 0.5) !important;
+  }
+  &-addListBtn {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+
+.setting-create-meta-drawer {
+  .set:hover {
+    color: #ff4d4f;
+  }
+  &-content {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    gap: 24px;
+    &-select {
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      margin-right: -12px;
+      margin-left: -16px;
+    }
+    .ant-table-thead > tr > th {
+      color: var(--io-N-, #021429);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: normal;
+    }
+  }
+  &-table {
+    margin: 20px 0px;
+    overflow: hidden;
+    border-radius: 8px;
+  }
+
+  &-info {
+    display: flex;
+    flex-direction: row;
+    gap: 12px;
+    align-items: center;
+    height: 32px;
+    &-title {
+      display: flex;
+      flex-direction: row;
+      gap: 4px;
+      justify-content: flex-end;
+      width: 68px;
+      color: var(--io-N6-, #67727f);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: 32px;
+      line-height: normal;
+      text-align: right;
+    }
+    &-input {
+      position: relative;
+      flex: 1;
+      .button:not(.disabled):not(.ant-btn-primary) {
+        float: right;
+        padding: 0 16px;
+        color: #1454e5;
+        border: 1px solid #1454e5;
+      }
+      &-num {
+        position: absolute;
+        top: 6px;
+        right: 12px;
+        color: var(--io-N4-, #9aa1a9);
+        font-weight: 400;
+        font-size: 14px;
+        font-family: 'PingFang SC';
+        font-style: normal;
+        line-height: 20px;
+      }
+    }
+  }
+
+  &-footer {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    justify-content: flex-end;
+    margin: 0 -24px -24px;
+    padding: 18px 24px 18px 0px;
+    background: #fff;
+    border-top: 1px solid var(--io-N1-, #e6e7ea);
+  }
+  .ant-drawer-content-wrapper {
+    overflow-x: hidden;
+  }
+  .ant-drawer-content,
+  .ant-drawer-wrapper-body {
+    overflow: hidden !important;
+  }
+  .ant-drawer-body {
+    display: flex;
+    flex-direction: column;
+  }
+  .ant-drawer-title {
+    span {
+      margin-left: 8px;
+      color: #9aa1a9;
+      font-size: 12px;
+    }
+  }
+  .ant-drawer-close {
+    display: none;
+  }
+  .ant-drawer-extra {
+    .qingchu {
+      font-size: 20px !important;
+      cursor: pointer;
+    }
+  }
+  .ant-form-item-control-input-content {
+    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

@@ -201,7 +201,7 @@ var pointMap = function pointMap(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
-        pageNum = (res === null || res === void 0 ? void 0 : res.data.length) + 1;
+        pageNum = ((res === null || res === void 0 ? void 0 : res.data.length) || 0) + 1;
         setTreeData(formatTreeData((res === null || res === void 0 ? void 0 : res.data) || []));
         setTreeArr(formatTreeArr((res === null || res === void 0 ? void 0 : res.data) || [], [], '') || []);
         if (!selectedKeys) {
@@ -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.6",
+  "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": "d683909a541176c20d6bc50e315559251fa362a3",
+  "gitHead": "1756aba61064e28b66ad537e900d35c18c2e3f57",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }