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

package/es/constants/api.d.ts

@@ -132,6 +132,8 @@ declare let apis: {
         tagDownload: string;
         tagDelete: string;
         tagTemplate: string;
+        addLabelRelation: string;
+        delLabelRelation: string;
     };
     queryUserByCompanyId: string;
     flowSave: string;

package/es/constants/api.js

@@ -160,7 +160,10 @@ var apis = {
     tagDownload: '/zg/web/v2/eventLabel/download',
     tagDelete: '/zg/web/v2/eventLabel/delete',
     //标签模板
-    tagTemplate: '/zg/web/v2/eventLabel/template'
+    tagTemplate: '/zg/web/v2/eventLabel/template',
+    //绑定
+    addLabelRelation: '/zg/web/v2/eventLabel/addLabelRelation',
+    delLabelRelation: '/zg/web/v2/eventLabel/delLabelRelation'
   },
   // 查询公司下所有用户
   queryUserByCompanyId: '/zg/web/v2/user/queryUserByCompanyId',

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,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), {}, {
@@ -121,9 +125,11 @@ var CreateMeta = function CreateMeta(props) {
                 props.onSubmit({
                   eventName: values.eventName,
                   aliasName: values.aliasName,
-                  triggeringOccasion: values.triggeringOccasion,
+                  triggeringOccasion: triTagInput,
                   del: 1,
-                  eventAttrList: eventAttrList
+                  eventAttrList: eventAttrList,
+                  businessLabelId: values.businessLabelId,
+                  triggerLabelId: triTagId
                 }, 'create');
               }
             }
@@ -433,6 +439,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) {
@@ -461,11 +469,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.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) {
@@ -502,7 +557,7 @@ var CreateMeta = function CreateMeta(props) {
     initialValues: {
       eventName: '',
       aliasName: '',
-      triggeringOccasion: '',
+      businessLabelId: '',
       maidianID: []
     }
   }, homeType == 'create' && (/*#__PURE__*/React.createElement(Form.Item, {
@@ -567,14 +622,10 @@ var CreateMeta = function CreateMeta(props) {
     },
     disabled: homeType == 'update' || homeType == 'get',
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
-    options: [{
-      label: '业务标签1',
-      value: '111'
-    }, {
-      label: '业务标签2',
-      value: 'tagJson'
-    }],
-    onChange: function onChange() {
+    defaultValue: triTagId,
+    options: triTag,
+    onChange: function onChange(value) {
+      setTriTagId(value);
       setIsChange(true);
     }
   }), "\u6216", /*#__PURE__*/React.createElement(Input, {
@@ -585,25 +636,21 @@ 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, {
-    name: "triggeringOccasion1",
+    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: [{
-      label: '业务标签1',
-      value: '111'
-    }, {
-      label: '业务标签2',
-      value: 'tagJson'
-    }],
+    options: bizTag,
     onChange: function onChange() {
       setIsChange(true);
     }

package/es/modules/pointMap/pageInfo.js

@@ -217,7 +217,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
             };
           }) : []);
           //计算出当前上线和下线总合数量
@@ -519,17 +522,17 @@ var PageInfo = function PageInfo(props) {
       }, /*#__PURE__*/React.createElement("span", {
         className: "".concat(classPrefix, "-content-popoverTag-label")
       }, "\u4E1A\u52A1\u6807\u7B7E:"), record.businessLabel && /*#__PURE__*/React.createElement(Tag, {
-        color: "blud"
+        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: "blud"
+        color: "orange"
       }, record.triggerLabel.labelName)));
       return /*#__PURE__*/React.createElement(Popover, {
         content: content,
-        title: eventName || ''
+        title: sliceName(eventName) || ''
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           if (!isSelect) {
@@ -918,7 +921,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) {
-      return res.labelType == 2;
+      return res.labelType == 1;
     }).map(function (res) {
       return res.labelName;
     }).join('_') || '';
@@ -1188,6 +1191,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,161 @@
-.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;
+  }
+}

package/es/modules/pointMap/tree.js

@@ -58,7 +58,9 @@ var formatTreeArr = function formatTreeArr(list, arrTemp, parentName) {
         arrTemp.push({
           id: item.id,
           name: parentName ? parentName + ' / ' + item.name : item.name,
-          tagJson: '字典标签1'
+          tagJson: item.labels.map(function (res) {
+            return res.labelName;
+          }).join('')
         });
         if (item.children.length > 0) {
           formatTreeArr(item.children, arrTemp, item.name);
@@ -199,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;
+        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) {
@@ -219,8 +221,11 @@ var pointMap = function pointMap(props) {
   //查询位置标签
   var getPointList = function getPointList() {
     request(apis.dict.getTagList, {
-      labelType: 1,
-      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      method: 'post',
+      data: {
+        labelType: 1,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
     }).then(function (res) {
       if (res.code == 100000) {
         setPointList(res.data.map(function (res) {
@@ -364,6 +369,7 @@ var pointMap = function pointMap(props) {
   var titleRender = function titleRender(nodeData) {
     var onItemClick = function onItemClick(_ref) {
       var key = _ref.key;
+      console.log(key, 'key');
       switch (key) {
         case '0':
           if (nodeData.storey >= 20) {
@@ -395,17 +401,16 @@ var pointMap = function pointMap(props) {
       // message.info(`Click on item ${key}`);
     };
     //位置标签list
-    var pointContent = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tag, {
-      color: "magenta"
-    }, "magenta"), /*#__PURE__*/React.createElement(Tag, {
-      color: "red"
-    }, "red"), /*#__PURE__*/React.createElement(Tag, {
-      color: "volcano"
-    }, "volcano"), /*#__PURE__*/React.createElement(Tag, {
-      color: "orange"
-    }, "orange"), /*#__PURE__*/React.createElement(Tag, {
-      color: "gold"
-    }, "gold"));
+    var color = ['magenta', 'red', 'volcano', 'orange', 'gold', 'lime', 'green', 'cyan', 'blue', 'geekblue', 'purple'];
+    var pointContent = /*#__PURE__*/React.createElement(React.Fragment, null, nodeData.labels.map(function (res, index) {
+      return /*#__PURE__*/React.createElement(Tag, {
+        key: index,
+        color: color[index]
+      }, res.labelName);
+    }));
+    var pointIds = nodeData.labels.map(function (res) {
+      return res.id;
+    });
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-tree-item")
     }, changeNameId === nodeData.id ? (/*#__PURE__*/React.createElement(Input, {
@@ -452,21 +457,11 @@ var pointMap = function pointMap(props) {
       }
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-tree-item-title-name")
-    }, nodeData.name, " (1) "), /*#__PURE__*/React.createElement(Popover, {
+    }, nodeData.name, " ", nodeData.pointSum ? "(".concat(nodeData.pointSum, ")") : ''), /*#__PURE__*/React.createElement(Popover, {
       placement: "topLeft",
       title: "\u4F4D\u7F6E\u6807\u7B7E",
       content: pointContent
-    }, /*#__PURE__*/React.createElement(Tag, {
-      color: "magenta"
-    }, "magenta"), /*#__PURE__*/React.createElement(Tag, {
-      color: "red"
-    }, "red"), /*#__PURE__*/React.createElement(Tag, {
-      color: "volcano"
-    }, "volcano"), /*#__PURE__*/React.createElement(Tag, {
-      color: "orange"
-    }, "orange"), /*#__PURE__*/React.createElement(Tag, {
-      color: "gold"
-    }, "gold"))))), /*#__PURE__*/React.createElement(Dropdown, {
+    }, pointContent)))), /*#__PURE__*/React.createElement(Dropdown, {
       disabled: !authority[1724922805],
       placement: 'bottomRight',
       menu: {
@@ -494,10 +489,11 @@ var pointMap = function pointMap(props) {
           key: '5',
           children: pointList.map(function (res) {
             return {
-              key: '3' + res.value,
+              key: '5' + res.value,
               label: (/*#__PURE__*/React.createElement(Checkbox, {
+                defaultChecked: pointIds.indexOf(res.value) != -1,
                 onChange: function onChange(e) {
-                  onChangeTag(e, 'key');
+                  onChangeTag(e, nodeData.id, res.value);
                 }
               }, res.label)),
               disabled: true
@@ -533,8 +529,24 @@ var pointMap = function pointMap(props) {
       type: "gengduocaozuo1"
     })));
   };
-  var onChangeTag = function onChangeTag(e, key) {
-    console.log(e, key, 'onChangeTag');
+  var onChangeTag = function onChangeTag(e, nodeId, value) {
+    labelRelation(e.target.checked, nodeId, value);
+  };
+  //绑定和解绑标签
+  var labelRelation = function labelRelation(checked, nodeId, tagId) {
+    request(checked ? apis.dict.addLabelRelation : apis.dict.delLabelRelation, {
+      method: 'post',
+      data: {
+        id: tagId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        labelType: 1,
+        eventId: nodeId
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        getPointTree();
+      }
+    });
   };
   var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
@@ -660,6 +672,7 @@ var pointMap = function pointMap(props) {
     }],
     onChange: function onChange(value) {
       setSearchType(value);
+      setValue(undefined);
     }
   })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     value: value,
@@ -676,6 +689,7 @@ var pointMap = function pointMap(props) {
       value: 'id',
       label: 'name'
     },
+    allowClear: true,
     options: treeArr,
     popupClassName: "".concat(classPrefix, "-search-popup")
   })), /*#__PURE__*/React.createElement("div", {

package/package.json

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