@zgfe/modules-settings 2.1.0-zhongyuan.1 → 2.1.0-zhongyuan.11

package/es/modules/pointMap/createMetaDrawer.js

@@ -23,6 +23,8 @@ 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 classPrefix = 'setting-create-meta-drawer';
   var _useContext = useContext(BizGlobalDataContext),
@@ -74,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));
@@ -111,10 +115,9 @@ var CreateMeta = function CreateMeta(props) {
             });
             return _context.abrupt("return");
           case 11:
-            //吧参数传递给主页面
+            //把参数传递给主页面
             if (props.onSubmit) {
               if (props.data) {
-                console.log(eventAttrList, 'EventAttrList');
                 props.onSubmit(_objectSpread(_objectSpread({}, props.data), {}, {
                   eventAttrList: eventAttrList
                 }), 'update');
@@ -122,33 +125,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:
@@ -434,6 +423,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) {
@@ -462,11 +453,58 @@ var CreateMeta = function CreateMeta(props) {
       })));
     }
   };
-  // 自定义验证规则
-  var _useState17 = useState(''),
+  //标签列表数据 2:业务标签 3:触发标签
+  var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    inputText = _useState18[0],
-    setInputText = _useState18[1];
+    bizTag = _useState18[0],
+    setBizTag = _useState18[1];
+  var _useState19 = useState(),
+    _useState20 = _slicedToArray(_useState19, 2),
+    triTagInput = _useState20[0],
+    setTriTagInput = _useState20[1];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    triTag = _useState22[0],
+    setTriTag = _useState22[1];
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    triTagId = _useState24[0],
+    setTriTagId = _useState24[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 _useState25 = useState(''),
+    _useState26 = _slicedToArray(_useState25, 2),
+    inputText = _useState26[0],
+    setInputText = _useState26[1];
   // true 验证通过
   var validateContainsUnderscore = function validateContainsUnderscore(value) {
     if (!isChange) {
@@ -503,7 +541,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      triggeringOccasion: '',
+      businessLabelId: undefined,
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {
@@ -559,15 +597,45 @@ var CreateMeta = function CreateMeta(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "triggeringOccasion",
     label: "\u89E6\u53D1\u65F6\u673A"
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(Select, {
+    allowClear: true,
+    style: {
+      border: 0,
+      width: '160px',
+      marginRight: '10px'
+    },
+    disabled: homeType == 'update' || homeType == 'get',
+    placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
+    defaultValue: triTagId,
+    options: triTag,
+    onChange: function onChange(value) {
+      setTriTagId(value);
+      setIsChange(true);
+    }
+  }), "\u6216", /*#__PURE__*/React.createElement(Input, {
     disabled: homeType == 'update' || homeType == 'get',
     style: {
-      border: 0
+      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,
     showCount: true,
     maxLength: 128,
     onChange: function onChange(e) {
+      setTriTagInput(e.target.value);
+      setIsChange(true);
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "businessLabelId",
+    label: "\u4E1A\u52A1\u6807\u7B7E"
+  }, /*#__PURE__*/React.createElement(Select, {
+    allowClear: true,
+    disabled: homeType == 'update' || homeType == 'get',
+    placeholder: "\u8BF7\u8F93\u5165\u4E1A\u52A1\u6807\u7B7E",
+    options: bizTag,
+    onChange: function onChange() {
       setIsChange(true);
     }
   }))), homeType != 'get' && (/*#__PURE__*/React.createElement("div", {

package/es/modules/pointMap/pageInfo.js

@@ -18,7 +18,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { BizDialog, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Input, message, Button, Table, notification, Upload, Image, Checkbox, Empty, Tooltip, Popover, Modal, Drawer, Spin } from 'antd';
+import { Input, message, Button, Table, notification, Upload, Image, Checkbox, Empty, Tooltip, Popover, Modal, Drawer, Spin, Tag } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import _ from 'lodash';
 import './styles/pageInfo.less';
@@ -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
             };
           }) : []);
           //计算出当前上线和下线总合数量
@@ -470,7 +471,7 @@ var PageInfo = function PageInfo(props) {
     }, [eventAttrList]);
   }
   // 表格列表筛选项
-  var columns = [].concat(_toConsumableArray(!isEdit && !isSelect ? [{
+  var columns = [].concat(_toConsumableArray(isSelect ? [{
     title: (/*#__PURE__*/React.createElement(Checkbox, {
       checked: checkedAllHandle(),
       onChange: function onChange(e) {
@@ -512,9 +513,24 @@ var PageInfo = function PageInfo(props) {
     ellipsis: true,
     width: 198,
     render: function render(eventName, record, index) {
-      return /*#__PURE__*/React.createElement(Tooltip, {
-        title: eventName || '',
-        placement: "topLeft"
+      var content = /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-content-popoverTag")
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-content-popoverTag-item")
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "".concat(classPrefix, "-content-popoverTag-label")
+      }, "\u4E1A\u52A1\u6807\u7B7E:"), record.businessLabel && /*#__PURE__*/React.createElement(Tag, {
+        color: "blue"
+      }, 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:"), record.triggerLabel && /*#__PURE__*/React.createElement(Tag, {
+        color: "orange"
+      }, record.triggerLabel.labelName)));
+      return /*#__PURE__*/React.createElement(Popover, {
+        content: content,
+        title: sliceName(record) || ''
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           if (!isSelect) {
@@ -537,7 +553,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
@@ -868,20 +884,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);
@@ -899,6 +911,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;
+    }).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", {
@@ -1158,6 +1185,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

@@ -35,6 +35,11 @@
     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 {
@@ -149,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;
+  }
 }