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

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

@@ -145,7 +145,7 @@ var apis = {
   dict: {
     //字典管理
     getDictList: '/zg/web/v2/systemSettings/attr/dict/list',
-    getDictPage: '/zg/web/v2/systemsetting/attr/dict/listByPage',
+    getDictPage: '/zg/web/v2/systemSettings/attr/dict/listByPage',
     dictSave: '/zg/web/v2/systemSettings/attr/dict/save',
     dictUpdate: '/zg/web/v2/systemSettings/attr/dict/update',
     dictUpload: '/zg/web/v2/systemSettings/attr/dict/upload',
@@ -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),
@@ -123,7 +125,8 @@ var CreateMeta = function CreateMeta(props) {
                   aliasName: values.aliasName,
                   triggeringOccasion: values.triggeringOccasion,
                   del: 1,
-                  eventAttrList: eventAttrList
+                  eventAttrList: eventAttrList,
+                  bizTagId: bizTagId
                 }, 'create');
               }
             }
@@ -433,6 +436,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 +466,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),
+    bizTagId = _useState20[0],
+    setBizTagId = _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.name,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                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) {
@@ -567,14 +619,9 @@ 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() {
+    options: triTag,
+    onChange: function onChange(value) {
+      setBizTagId(value);
       setIsChange(true);
     }
   }), "\u6216", /*#__PURE__*/React.createElement(Input, {
@@ -591,19 +638,13 @@ var CreateMeta = function CreateMeta(props) {
       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
             };
           }) : []);
           //计算出当前上线和下线总合数量
@@ -518,18 +521,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(eventName) || ''
       }, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           if (!isSelect) {
@@ -552,7 +555,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
@@ -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 = record.labels && record.labels.filter(function (res) {
+      return res.labelType == 1;
+    }).map(function (res) {
+      return res.labelName;
+    }).join('_') || '';
+    var biz = record.businessLabel && ((_record$businessLabel = record.businessLabel) === null || _record$businessLabel === void 0 ? void 0 : _record$businessLabel.labelName) || '';
+    var trig = 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", {

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);
@@ -143,12 +145,17 @@ var pointMap = function pointMap(props) {
     _useState32 = _slicedToArray(_useState31, 2),
     isShowDel = _useState32[0],
     setIsShowDel = _useState32[1];
-  var _useState33 = useState(!!props.pageStatusIsEdit),
+  var _useState33 = useState([]),
     _useState34 = _slicedToArray(_useState33, 2),
-    pageStatusIsEdit = _useState34[0],
-    setPageStatusIsEdit = _useState34[1];
+    pointList = _useState34[0],
+    setPointList = _useState34[1];
+  var _useState35 = useState(!!props.pageStatusIsEdit),
+    _useState36 = _slicedToArray(_useState35, 2),
+    pageStatusIsEdit = _useState36[0],
+    setPageStatusIsEdit = _useState36[1];
   useEffect(function () {
     pointGetVersion();
+    getPointList();
   }, []);
   useEffect(function () {
     setPageStatusIsEdit(!!props.pageStatusIsEdit);
@@ -194,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) + 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) {
@@ -211,6 +218,25 @@ var pointMap = function pointMap(props) {
       console.log(err);
     });
   };
+  //查询位置标签
+  var getPointList = function getPointList() {
+    request(apis.dict.getTagList, {
+      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) {
+          return {
+            label: res.labelName,
+            value: res.id
+          };
+        }));
+      }
+    });
+  };
   var addPage = function addPage(operationType, parentId, targetPageId) {
     request(apis.createPage, {
       method: 'post',
@@ -343,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) {
@@ -374,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, {
@@ -431,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: {
@@ -471,23 +487,18 @@ var pointMap = function pointMap(props) {
           label: '选择位置标签',
           icon: /*#__PURE__*/React.createElement(EnvironmentOutlined, null),
           key: '5',
-          children: [{
-            key: '3-1',
-            label: (/*#__PURE__*/React.createElement(Checkbox, {
-              onChange: function onChange(e) {
-                onChangeTag(e, 'key');
-              }
-            }, "\u6807\u7B7E1")),
-            disabled: true
-          }, {
-            key: '3-2',
-            label: (/*#__PURE__*/React.createElement(Checkbox, {
-              onChange: function onChange(e) {
-                onChangeTag(e, 'key');
-              }
-            }, "\u6807\u7B7E2")),
-            disabled: true
-          }]
+          children: pointList.map(function (res) {
+            return {
+              key: '5' + res.value,
+              label: (/*#__PURE__*/React.createElement(Checkbox, {
+                defaultChecked: pointIds.indexOf(res.value) != -1,
+                onChange: function onChange(e) {
+                  onChangeTag(e, nodeData.id, res.value);
+                }
+              }, res.label)),
+              disabled: true
+            };
+          })
         }, {
           type: 'divider'
         }, {
@@ -518,31 +529,47 @@ 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 _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    isOpen = _useState36[0],
-    setIsOpen = _useState36[1];
+  //绑定和解绑标签
+  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),
+    isOpen = _useState38[0],
+    setIsOpen = _useState38[1];
   var downloadHelpFile = function downloadHelpFile() {
     window.open("/\u63A8\u8350\u57CB\u70B9\u65B9\u6848.xlsx");
   };
   // 分享看板二维码
-  var _useState37 = useState(''),
-    _useState38 = _slicedToArray(_useState37, 2),
-    qrCodeShare = _useState38[0],
-    setqrCodeShare = _useState38[1];
-  // 分享看板二维码-显示控制
-  var _useState39 = useState(false),
+  var _useState39 = useState(''),
     _useState40 = _slicedToArray(_useState39, 2),
-    qrCodeShareShow = _useState40[0],
-    setqrCodeShareShow = _useState40[1];
-  // 二维码加载中
+    qrCodeShare = _useState40[0],
+    setqrCodeShare = _useState40[1];
+  // 分享看板二维码-显示控制
   var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    qrCodeLoading = _useState42[0],
-    setQrCodeLoading = _useState42[1];
+    qrCodeShareShow = _useState42[0],
+    setqrCodeShareShow = _useState42[1];
+  // 二维码加载中
+  var _useState43 = useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    qrCodeLoading = _useState44[0],
+    setQrCodeLoading = _useState44[1];
   var onOpenChangeShare = function onOpenChangeShare(open) {
     setqrCodeShareShow(open);
     if (qrCodeShare === '') {
@@ -645,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,
@@ -661,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/es/modules/systemSetting/dictionaryItem/eventTagManagement/index.js

@@ -124,12 +124,13 @@ var locationTagManagement = function locationTagManagement(_ref) {
     exportLoading = _useState10[0],
     setExportLoading = _useState10[1];
   var onExport = function onExport() {
-    if (!exportLoading) return;
+    if (exportLoading) return;
     setExportLoading(true);
     request(apis.dict.tagDownload, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        labelType: type
       },
       responseType: 'blob'
     }).then(function () {
@@ -251,6 +252,7 @@ var locationTagManagement = function locationTagManagement(_ref) {
     },
     onSuccess: function onSuccess(result) {
       setOpenImportModal(false);
+      getList();
     }
   })));
 };

package/package.json

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