@zgfe/modules-settings 2.1.0-zhongyuan.3 → 2.1.0-zhongyuan.30

package/es/modules/pointMap/createMetaDrawer.js

@@ -23,7 +23,10 @@ import React, { useContext, useEffect, useState } from 'react';
 import _ from 'lodash';
 import BizEditText from './editTxt';
 import './styles/index.less';
+import request from '../../utils/ajax';
+import apis from '../../constants/api';
 var CreateMeta = function CreateMeta(props) {
+  var _props$data;
   var classPrefix = 'setting-create-meta-drawer';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
@@ -74,8 +77,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));
@@ -111,7 +116,7 @@ var CreateMeta = function CreateMeta(props) {
             });
             return _context.abrupt("return");
           case 11:
-            //吧参数传递给主页面
+            //把参数传递给主页面
             if (props.onSubmit) {
               if (props.data) {
                 props.onSubmit(_objectSpread(_objectSpread({}, props.data), {}, {
@@ -121,33 +126,19 @@ var CreateMeta = function CreateMeta(props) {
                 props.onSubmit({
                   eventName: values.eventName,
                   aliasName: values.aliasName,
-                  triggeringOccasion: values.triggeringOccasion,
-                  del: 1,
-                  eventAttrList: eventAttrList
+                  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');
               }
             }
-            // 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:
@@ -179,6 +170,10 @@ 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',
@@ -202,14 +197,24 @@ 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: hasEventName,
+        maxLength: 128,
         onChange: function onChange(e) {
           setIsChange(true);
-          changeItemInfo(index, 'name', e);
+          changeItemInfo(index, 'name', e.target.value);
+        },
+        onBlur: function onBlur(e) {
+          var valueEventName = e.target.value;
+          var name = eventAttrList.find(function (o) {
+            return o.name == valueEventName;
+          });
+          setHasEventName(name ? 'error' : '');
+          name && message.error('事件名称不能重复');
         }
       }));
     }
@@ -403,10 +408,10 @@ var CreateMeta = function CreateMeta(props) {
       }, "\u5220\u9664");
     }
   });
-  var _useState15 = useState(''),
-    _useState16 = _slicedToArray(_useState15, 2),
-    scrollY = _useState16[0],
-    setScrollY = _useState16[1];
+  var _useState17 = useState(''),
+    _useState18 = _slicedToArray(_useState17, 2),
+    scrollY = _useState18[0],
+    setScrollY = _useState18[1];
   var getTableScroll = function getTableScroll(extraHeight, id) {
     if (typeof extraHeight == 'undefined') {
       //  默认底部分页64 + 边距10
@@ -433,6 +438,8 @@ var CreateMeta = function CreateMeta(props) {
   useEffect(function () {
     var _Y = getTableScroll(545, 'dataManageCreateMetaTable');
     setScrollY(_Y);
+    getTagList(2);
+    getTagList(3);
   }, []);
   var onClose = function onClose() {
     if (isChange) {
@@ -445,6 +452,23 @@ var CreateMeta = function CreateMeta(props) {
   var changeSwitch = function changeSwitch(event) {
     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([res.data.map(function (res) {
+        return _objectSpread(_objectSpread({}, res), {}, {
+          aliasName: res.alias,
+          name: res.label
+        });
+      })]);
+    });
+  }
   var onChangeEvent = function onChangeEvent(_ref2) {
     var event = _ref2.event;
     form.setFieldsValue({
@@ -452,20 +476,60 @@ 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 _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    bizTag = _useState20[0],
+    setBizTag = _useState20[1];
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    triTagInput = _useState22[0],
+    setTriTagInput = _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];
+  var getTagList = function getTagList(type) {
+    request(apis.dict.getTagList, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        labelType: type
+      }
+    }).then(function (res) {
+      if (res && res.code == '100000') {
+        switch (type) {
+          case 2:
+            setBizTag(res.data.map(function (res) {
+              return {
+                label: res.labelName,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.labelName,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
   };
   // 自定义验证规则
-  var _useState17 = useState(''),
-    _useState18 = _slicedToArray(_useState17, 2),
-    inputText = _useState18[0],
-    setInputText = _useState18[1];
+  var _useState27 = useState(''),
+    _useState28 = _slicedToArray(_useState27, 2),
+    inputText = _useState28[0],
+    setInputText = _useState28[1];
   // true 验证通过
   var validateContainsUnderscore = function validateContainsUnderscore(value) {
     if (!isChange) {
@@ -502,7 +566,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      triggeringOccasion: '',
+      businessLabelId: (props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.businessLabelId) || undefined,
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {
@@ -526,7 +590,11 @@ 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, {
+  }, isCopy ? (/*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
     multiple: false,
     key: "eventProp",
@@ -548,7 +616,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,
@@ -565,45 +633,39 @@ 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",
-    options: [{
-      label: '业务标签1',
-      value: '111'
-    }, {
-      label: '业务标签2',
-      value: 'tagJson'
-    }],
-    onChange: function onChange() {
+    // defaultValue={triTagId}
+    value: triTagId,
+    options: triTag,
+    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}
+    value: triTagInput,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
+      setTriTagInput(e.target.value);
       setIsChange(true);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "triggeringOccasion1",
+    name: "businessLabelId",
     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: [{
-      label: '业务标签1',
-      value: '111'
-    }, {
-      label: '业务标签2',
-      value: 'tagJson'
-    }],
+    options: bizTag,
     onChange: function onChange() {
       setIsChange(true);
     }

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() {
@@ -217,7 +215,10 @@ var PageInfo = function PageInfo(props) {
               index: index,
               approvalStatus: item.approvalStatus,
               operationType: item.operationType,
-              isOnline: item.isOnline || 0
+              isOnline: item.isOnline || 0,
+              businessLabel: item.businessLabel,
+              triggerLabel: item.triggerLabel,
+              labels: item.labels
             };
           }) : []);
           //计算出当前上线和下线总合数量
@@ -249,6 +250,12 @@ var PageInfo = function PageInfo(props) {
       });
       return;
     }
+    if (!imgUrl) {
+      notification.warning({
+        message: '请选择页面图示'
+      });
+      return;
+    }
     if (eventAttrList.filter(function (item) {
       return !item.eventId;
     }).length) {
@@ -518,18 +525,18 @@ var PageInfo = function PageInfo(props) {
         className: "".concat(classPrefix, "-content-popoverTag-item")
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-content-popoverTag-label")
-      }, "\u4E1A\u52A1\u6807\u7B7E:"), /*#__PURE__*/React.createElement(Tag, {
+      }, "\u4E1A\u52A1\u6807\u7B7E:"), record.businessLabel && /*#__PURE__*/React.createElement(Tag, {
         color: "blue"
-      }, "\u4E1A\u52A1\u6807\u7B7E1")), /*#__PURE__*/React.createElement("div", {
+      }, record.businessLabel.labelName)), /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-popoverTag-item")
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-content-popoverTag-label")
-      }, "\u89E6\u53D1\u6807\u7B7E:"), /*#__PURE__*/React.createElement(Tag, {
+      }, "\u89E6\u53D1\u6807\u7B7E:"), record.triggerLabel && /*#__PURE__*/React.createElement(Tag, {
         color: "orange"
-      }, "\u89E6\u53D1\u6807\u7B7E")));
+      }, record.triggerLabel.labelName)));
       return /*#__PURE__*/React.createElement(Popover, {
         content: content,
-        title: eventName || ''
+        title: sliceName(record) || ''
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           if (!isSelect) {
@@ -552,7 +559,7 @@ var PageInfo = function PageInfo(props) {
             setMetaDataIndex(index);
           }
         }
-      }, eventName ? eventName : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
+      }, eventName ? sliceName(record) : '选择元事件', !eventName && /*#__PURE__*/React.createElement(IconFont, {
         type: "zhuanfa",
         style: {
           marginLeft: 8
@@ -883,20 +890,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);
@@ -914,6 +917,21 @@ var PageInfo = function PageInfo(props) {
     setRecordShow(true);
     setEventData(row);
   };
+  //拼接名称
+  var sliceName = function sliceName(record) {
+    var _record$businessLabel, _record$triggerLabel;
+    var point = props.pageData && props.pageData.labels && props.pageData.labels.filter(function (res) {
+      return res.labelType == 1;
+    }).map(function (res) {
+      return res.labelName || res.label;
+    }).join('_') || '';
+    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('-');
+    return arr;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix)
   }, /*#__PURE__*/React.createElement("div", {
@@ -994,7 +1012,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")
@@ -1173,6 +1195,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

@@ -154,4 +154,12 @@
       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;
+  }
 }