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

package/es/components/importMetaDialog/index.d.ts

@@ -7,5 +7,7 @@ declare const ImportModal: React.FC<{
     downloadTempleUrl: string;
     uploadFile: string;
     fileName?: string;
+    params?: any;
+    showHistory?: boolean;
 }>;
 export default ImportModal;

package/es/components/importMetaDialog/index.js

@@ -29,7 +29,7 @@ var ImportModal = function ImportModal(props) {
     errorLoc = _useState4[0],
     setErrorLoc = _useState4[1];
   var handleImportResultOk = function handleImportResultOk() {
-    setOpenImportModalResult(false);
+    props.onSuccess && props.onSuccess({});
     setErrorLoc(undefined);
   };
   var _useState5 = useState(),
@@ -92,14 +92,29 @@ var ImportModal = function ImportModal(props) {
     var formData = new FormData();
     formData.append('appId', currentApp.appId);
     formData.append('file', fileData);
+    if (props.params) {
+      for (var key in props.params) {
+        formData.append(key, props.params[key]);
+      }
+    }
     setLoading(true);
     request(props.uploadFile, {
       method: 'post',
       data: formData
     }).then(function (res) {
       if (!res) return;
-      message.success('导入成功');
-      props.onSuccess && props.onSuccess(res.data);
+      //进入历史记录
+      if (props.showHistory && res.data) {
+        setOpenImportModalResult(true);
+        setErrorLoc({
+          successLocCount: res.data['导入成功条数'],
+          failedLocCount: res.data['导入失败条数'],
+          failedLocNames: res.data['导入失败标签名']
+        });
+      } else {
+        message.success('导入成功');
+        props.onSuccess && props.onSuccess(res.data);
+      }
     }).catch(function (e) {
       console.log(e);
     }).finally(function () {

package/es/constants/api.d.ts

@@ -118,12 +118,14 @@ declare let apis: {
     };
     dict: {
         getDictList: string;
+        getDictPage: string;
         dictSave: string;
         dictUpdate: string;
         dictUpload: string;
         dictDelete: string;
         dictTemplate: string;
         getTagList: string;
+        getTagPage: string;
         tagSave: string;
         tagUpdate: string;
         tagUpload: string;

package/es/constants/api.js

@@ -145,20 +145,22 @@ var apis = {
   dict: {
     //字典管理
     getDictList: '/zg/web/v2/systemSettings/attr/dict/list',
+    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',
     dictDelete: '/zg/web/v2/systemSettings/attr/dict/delete',
     dictTemplate: '/zg/web/v2/systemSettings/attr/dict/template',
     //位置标签管理
-    getTagList: '/zg/web/v2/label/eventLabel/list',
-    tagSave: '/zg/web/v2/label/eventLabel/save',
-    tagUpdate: '/zg/web/v2/label/eventLabel/update',
-    tagUpload: '/zg/web/v2/label/eventLabel/upload',
-    tagDownload: '/zg/web/v2/label/eventLabel/download',
-    tagDelete: '/zg/web/v2/label/eventLabel/delete',
+    getTagList: '/zg/web/v2/eventLabel/list',
+    getTagPage: '/zg/web/v2/eventLabel/listByPage',
+    tagSave: '/zg/web/v2/eventLabel/save',
+    tagUpdate: '/zg/web/v2/eventLabel/update',
+    tagUpload: '/zg/web/v2/eventLabel/upload',
+    tagDownload: '/zg/web/v2/eventLabel/download',
+    tagDelete: '/zg/web/v2/eventLabel/delete',
     //标签模板
-    tagTemplate: '/zg/web/v2/label/template'
+    tagTemplate: '/zg/web/v2/eventLabel/template'
   },
   // 查询公司下所有用户
   queryUserByCompanyId: '/zg/web/v2/user/queryUserByCompanyId',

package/es/modules/pointMap/pageInfo.js

@@ -518,15 +518,15 @@ 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, {
-        color: "blue"
-      }, "\u4E1A\u52A1\u6807\u7B7E1")), /*#__PURE__*/React.createElement("div", {
+      }, "\u4E1A\u52A1\u6807\u7B7E:"), record.businessLabel && /*#__PURE__*/React.createElement(Tag, {
+        color: "blud"
+      }, 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, {
-        color: "orange"
-      }, "\u89E6\u53D1\u6807\u7B7E")));
+      }, "\u89E6\u53D1\u6807\u7B7E:"), record.triggerLabel && /*#__PURE__*/React.createElement(Tag, {
+        color: "blud"
+      }, record.triggerLabel.labelName)));
       return /*#__PURE__*/React.createElement(Popover, {
         content: content,
         title: eventName || ''
@@ -552,7 +552,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 +914,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 == 2;
+    }).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

@@ -143,12 +143,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);
@@ -211,6 +216,22 @@ var pointMap = function pointMap(props) {
       console.log(err);
     });
   };
+  //查询位置标签
+  var getPointList = function getPointList() {
+    request(apis.dict.getTagList, {
+      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',
@@ -471,23 +492,17 @@ 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: '3' + res.value,
+              label: (/*#__PURE__*/React.createElement(Checkbox, {
+                onChange: function onChange(e) {
+                  onChangeTag(e, 'key');
+                }
+              }, res.label)),
+              disabled: true
+            };
+          })
         }, {
           type: 'divider'
         }, {
@@ -521,28 +536,28 @@ var pointMap = function pointMap(props) {
   var onChangeTag = function onChangeTag(e, key) {
     console.log(e, key, 'onChangeTag');
   };
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    isOpen = _useState36[0],
-    setIsOpen = _useState36[1];
+  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 === '') {

package/es/modules/systemSetting/dictionaryItem/dictionaryManagement/index.js

@@ -124,7 +124,7 @@ var DictionaryManagement = function DictionaryManagement() {
   }, []);
   //分页搜索
   var getList = function getList() {
-    request(apis.dict.getDictList, {
+    request(apis.dict.getDictPage, {
       method: 'post',
       data: {
         pageNo: tableParams.current,

package/es/modules/systemSetting/dictionaryItem/eventTagManagement/create.js

@@ -33,10 +33,11 @@ var clear = function clear(_ref) {
     request((currentDetail === null || currentDetail === void 0 ? void 0 : currentDetail.id) ? apis.dict.tagUpdate : apis.dict.tagSave, {
       method: 'post',
       data: {
+        id: currentDetail === null || currentDetail === void 0 ? void 0 : currentDetail.id,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        name: values.name,
+        labelName: values.labelName,
         remark: values.remark,
-        type: type
+        labelType: type
       }
     }).then(function (res) {
       if (!res) return;
@@ -58,7 +59,7 @@ var clear = function clear(_ref) {
   useEffect(function () {
     if (currentDetail) {
       formRef.setFieldsValue({
-        name: currentDetail.name,
+        labelName: currentDetail.labelName,
         remark: currentDetail.remark
       });
     }
@@ -70,10 +71,7 @@ var clear = function clear(_ref) {
     title: /*#__PURE__*/React.createElement("div", null, currentDetail ? '修改' : '创建', "\u6807\u7B7E", /*#__PURE__*/React.createElement("div", {
       className: "clearLoc-drawerCloseIcon",
       onClick: onClose
-    }, /*#__PURE__*/React.createElement(CloseOutlined, {
-      onPointerEnterCapture: undefined,
-      onPointerLeaveCapture: undefined
-    }))),
+    }, /*#__PURE__*/React.createElement(CloseOutlined, null))),
     onClose: onClose,
     closeIcon: false,
     open: open,
@@ -94,14 +92,14 @@ var clear = function clear(_ref) {
       span: 20
     },
     initialValues: {
-      name: '',
+      labelName: '',
       desctiption: ''
     },
     onFinish: onFinish,
     labelAlign: "right"
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6807\u7B7E\u540D",
-    name: "name",
+    name: "labelName",
     rules: [{
       required: true,
       message: '请输入标签名'

package/es/modules/systemSetting/dictionaryItem/eventTagManagement/index.js

@@ -40,8 +40,8 @@ var locationTagManagement = function locationTagManagement(_ref) {
     width: 80
   }, {
     title: title + '名',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'labelName',
+    key: 'labelName',
     render: function render(text) {
       return /*#__PURE__*/React.createElement(Tooltip, {
         title: text
@@ -56,8 +56,8 @@ var locationTagManagement = function locationTagManagement(_ref) {
     }
   }, {
     title: '创建人',
-    dataIndex: 'createUser',
-    key: 'createUser',
+    dataIndex: 'creatorName',
+    key: 'creatorName',
     width: 140
   }, {
     title: '备注',
@@ -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 () {
@@ -151,18 +152,18 @@ var locationTagManagement = function locationTagManagement(_ref) {
   }, []);
   //分页搜索
   var getList = function getList() {
-    request(apis.dict.getTagList, {
+    request(apis.dict.getTagPage, {
       method: 'post',
       data: {
         pageNo: tableParams.current,
         pageSize: tableParams.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        type: type
+        labelType: type
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        setLocList(res.data.data);
+        setLocList(res.data.labelList);
         // 总页数
         setTableParams(function (pre) {
           return _objectSpread(_objectSpread({}, pre), {}, {
@@ -245,7 +246,14 @@ var locationTagManagement = function locationTagManagement(_ref) {
     onCancel: function onCancel() {
       setOpenImportModal(false);
     },
-    onSuccess: function onSuccess(result) {}
+    showHistory: true,
+    params: {
+      labelType: type
+    },
+    onSuccess: function onSuccess(result) {
+      setOpenImportModal(false);
+      getList();
+    }
   })));
 };
 export default locationTagManagement;

package/es/modules/systemSetting/dictionaryItem/eventTagManagement/type/index.d.ts

@@ -1,6 +1,6 @@
 export interface DetailType {
     id: number;
-    name: string;
+    labelName: string;
     remark: string;
 }
 export interface List {

package/package.json

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