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

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

@@ -32,9 +32,12 @@
     position: relative;
     display: grid;
     grid-gap: 16px;
-    grid-template-columns: 1fr 20px;
+    grid-template-columns: 88px 1fr 20px;
     align-items: center;
     margin-top: 16px;
+    &-selectType {
+      width: 100px;
+    }
     .qrcode-img {
       display: inline-flex;
       flex-direction: column;
@@ -63,12 +66,12 @@
         padding-top: 138px;
       }
     }
-    .ant-select-selector {
-      padding-left: 40px !important;
-    }
-    .ant-select-selection-search-input {
-      padding-left: 30px !important;
-    }
+    // .ant-select-selector {
+    //   padding-left: 40px !important;
+    // }
+    // .ant-select-selection-search-input {
+    //   padding-left: 30px !important;
+    // }
     &-popup {
       .ant-select-item {
         height: 32px !important;
@@ -79,6 +82,7 @@
       position: absolute;
       top: 6px;
       left: 16px;
+      display: none;
     }
   }
   &-tree {
@@ -127,6 +131,9 @@
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        &-name {
+          margin-right: 10px;
+        }
       }
     }
     .ant-tree-title {

package/es/modules/pointMap/tree.js

@@ -15,8 +15,8 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { Button, Dropdown, Empty, Input, message, Modal, Select, Tree, Popover, Spin } from 'antd';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { Button, Dropdown, Empty, Input, message, Modal, Select, Tree, Popover, Spin, Tag, Checkbox } from 'antd';
+import { QuestionCircleOutlined, EnvironmentOutlined } from '@ant-design/icons';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import './styles/tree.less';
 import { BizDialog, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
@@ -57,7 +57,10 @@ var formatTreeArr = function formatTreeArr(list, arrTemp, parentName) {
         item.key = item.id;
         arrTemp.push({
           id: item.id,
-          name: parentName ? parentName + ' / ' + item.name : item.name
+          name: parentName ? parentName + ' / ' + item.name : item.name,
+          tagJson: item.labels.map(function (res) {
+            return res.labelName;
+          }).join('')
         });
         if (item.children.length > 0) {
           formatTreeArr(item.children, arrTemp, item.name);
@@ -130,20 +133,29 @@ var pointMap = function pointMap(props) {
     _useState26 = _slicedToArray(_useState25, 2),
     value = _useState26[0],
     setValue = _useState26[1];
-  var _useState27 = useState(true),
+  var _useState27 = useState('name'),
     _useState28 = _slicedToArray(_useState27, 2),
-    isInit = _useState28[0],
-    setIsInit = _useState28[1];
-  var _useState29 = useState(false),
+    searchType = _useState28[0],
+    setSearchType = _useState28[1];
+  var _useState29 = useState(true),
     _useState30 = _slicedToArray(_useState29, 2),
-    isShowDel = _useState30[0],
-    setIsShowDel = _useState30[1];
-  var _useState31 = useState(!!props.pageStatusIsEdit),
+    isInit = _useState30[0],
+    setIsInit = _useState30[1];
+  var _useState31 = useState(false),
     _useState32 = _slicedToArray(_useState31, 2),
-    pageStatusIsEdit = _useState32[0],
-    setPageStatusIsEdit = _useState32[1];
+    isShowDel = _useState32[0],
+    setIsShowDel = _useState32[1];
+  var _useState33 = useState([]),
+    _useState34 = _slicedToArray(_useState33, 2),
+    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);
@@ -189,9 +201,9 @@ var pointMap = function pointMap(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
+        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) || [], [], '') || []);
-        console.log('selectedKeys', selectedKeys);
         if (!selectedKeys) {
           setSelectedKeys((res === null || res === void 0 ? void 0 : res.data) ? [res === null || res === void 0 ? void 0 : res.data[0].id] : undefined);
           props.onChangePage((res === null || res === void 0 ? void 0 : res.data) ? _objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data[0]), {}, {
@@ -206,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',
@@ -311,7 +342,6 @@ var pointMap = function pointMap(props) {
     setAutoExpandParent(false);
   };
   var onDrop = function onDrop(info) {
-    // console.log('onDrop', info, selectedKeys);
     moveNode({
       oldParentId: info.dragNode.parentId,
       newParentId: info.dropToGap ? info.node.parentId : info.node.id,
@@ -337,10 +367,8 @@ var pointMap = function pointMap(props) {
     }
   };
   var titleRender = function titleRender(nodeData) {
-    // console.log('nodeData', nodeData);
     var onItemClick = function onItemClick(_ref) {
       var key = _ref.key;
-      console.log('key', key);
       switch (key) {
         case '0':
           if (nodeData.storey >= 20) {
@@ -371,6 +399,17 @@ var pointMap = function pointMap(props) {
       }
       // message.info(`Click on item ${key}`);
     };
+    //位置标签list
+    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, {
@@ -415,7 +454,13 @@ var pointMap = function pointMap(props) {
         setChangeNameId(nodeData.id);
         setChangeNameString(nodeData.name);
       }
-    }, nodeData.name))), /*#__PURE__*/React.createElement(Dropdown, {
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-tree-item-title-name")
+    }, nodeData.name, " (", nodeData.pointSum || 0, ")"), /*#__PURE__*/React.createElement(Popover, {
+      placement: "topLeft",
+      title: "\u4F4D\u7F6E\u6807\u7B7E",
+      content: pointContent
+    }, pointContent)))), /*#__PURE__*/React.createElement(Dropdown, {
       disabled: !authority[1724922805],
       placement: 'bottomRight',
       menu: {
@@ -437,6 +482,22 @@ var pointMap = function pointMap(props) {
             type: "xiafangtianjia"
           }),
           key: '2'
+        }, {
+          label: '选择位置标签',
+          icon: /*#__PURE__*/React.createElement(EnvironmentOutlined, null),
+          key: '5',
+          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, res);
+                }
+              }, res.label)),
+              disabled: true
+            };
+          })
         }, {
           type: 'divider'
         }, {
@@ -467,28 +528,59 @@ var pointMap = function pointMap(props) {
       type: "gengduocaozuo1"
     })));
   };
-  var _useState33 = useState(false),
-    _useState34 = _slicedToArray(_useState33, 2),
-    isOpen = _useState34[0],
-    setIsOpen = _useState34[1];
+  var onChangeTag = function onChangeTag(e, node, option) {
+    labelRelation(e.target.checked, node, option);
+  };
+  //绑定和解绑标签
+  var labelRelation = function labelRelation(checked, node, option) {
+    request(checked ? apis.dict.addLabelRelation : apis.dict.delLabelRelation, {
+      method: 'post',
+      data: {
+        id: option.value,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        labelType: 1,
+        eventId: node.id
+      }
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        getPointTree();
+        setTimeout(function () {
+          var labels = [];
+          if (checked) {
+            labels = node.labels.push(option);
+          } else {
+            labels = node.labels.filter(function (res) {
+              return res.id != option.value;
+            });
+          }
+          node.labels = labels;
+          props.onChangePage(node);
+        }, 500);
+      }
+    });
+  };
+  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 _useState35 = useState(''),
-    _useState36 = _slicedToArray(_useState35, 2),
-    qrCodeShare = _useState36[0],
-    setqrCodeShare = _useState36[1];
+  var _useState39 = useState(''),
+    _useState40 = _slicedToArray(_useState39, 2),
+    qrCodeShare = _useState40[0],
+    setqrCodeShare = _useState40[1];
   // 分享看板二维码-显示控制
-  var _useState37 = useState(false),
-    _useState38 = _slicedToArray(_useState37, 2),
-    qrCodeShareShow = _useState38[0],
-    setqrCodeShareShow = _useState38[1];
+  var _useState41 = useState(false),
+    _useState42 = _slicedToArray(_useState41, 2),
+    qrCodeShareShow = _useState42[0],
+    setqrCodeShareShow = _useState42[1];
   // 二维码加载中
-  var _useState39 = useState(false),
-    _useState40 = _slicedToArray(_useState39, 2),
-    qrCodeLoading = _useState40[0],
-    setQrCodeLoading = _useState40[1];
+  var _useState43 = useState(false),
+    _useState44 = _slicedToArray(_useState43, 2),
+    qrCodeLoading = _useState44[0],
+    setQrCodeLoading = _useState44[1];
   var onOpenChangeShare = function onOpenChangeShare(open) {
     setqrCodeShareShow(open);
     if (qrCodeShare === '') {
@@ -580,10 +672,24 @@ var pointMap = function pointMap(props) {
   }), "\u5BFC\u5165\u9875\u9762")), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-search")
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
+    className: "".concat(classPrefix, "-search-selectType"),
+    value: searchType,
+    options: [{
+      label: '页面名',
+      value: 'name'
+    }, {
+      label: '位置标签',
+      value: 'tagJson'
+    }],
+    onChange: function onChange(value) {
+      setSearchType(value);
+      setValue(undefined);
+    }
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     value: value,
-    placeholder: "\u8BF7\u8F93\u5165\u9875\u9762\u540D\u79F0\u641C\u7D22",
+    placeholder: searchType == 'name' ? '请输入页面名称搜索' : '请输入位置标签名',
     // searchValue={value}
-    optionFilterProp: 'name',
+    optionFilterProp: searchType,
     showArrow: false,
     showSearch: true,
     onChange: onTreeSelectChange,
@@ -594,10 +700,9 @@ var pointMap = function pointMap(props) {
       value: 'id',
       label: 'name'
     },
+    allowClear: true,
     options: treeArr,
     popupClassName: "".concat(classPrefix, "-search-popup")
-  }), /*#__PURE__*/React.createElement(IconFont, {
-    type: "sousuo"
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-search-pop")
   }, /*#__PURE__*/React.createElement(Popover, {

package/es/modules/systemSetting/Dictionary.d.ts

@@ -1,3 +1,6 @@
 import React from 'react';
-declare const Dictionary: React.FC;
-export default Dictionary;
+import './index.less';
+declare const CompanySetting: React.FC<{
+    onShowProcess: (data?: any, isEdit?: boolean) => void;
+}>;
+export default CompanySetting;