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

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/systemsetting/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/systemSetting/dictionaryItem/dictionaryManagement/create.js

@@ -36,7 +36,7 @@ var clearDict = function clearDict(_ref) {
     openImportModal = _useState6[0],
     setOpenImportModal = _useState6[1];
   var columns = [{
-    title: '字典名',
+    title: '属性值',
     dataIndex: 'name',
     key: 'name',
     render: function render(text, record, index) {
@@ -80,12 +80,13 @@ var clearDict = function clearDict(_ref) {
     request((currentDictDetail === null || currentDictDetail === void 0 ? void 0 : currentDictDetail.id) ? apis.dict.dictUpdate : apis.dict.dictSave, {
       method: 'post',
       data: {
+        id: (currentDictDetail === null || currentDictDetail === void 0 ? void 0 : currentDictDetail.id) || undefined,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        name: values.name,
+        dictName: values.dictName,
         remark: values.remark,
-        dictValue: dictList.map(function (res) {
+        dictValue: _toConsumableArray(new Set(dictList.map(function (res) {
           return res.name;
-        })
+        })))
       }
     }).then(function (res) {
       if (!res) return;
@@ -136,11 +137,12 @@ var clearDict = function clearDict(_ref) {
   //初始请求初始化
   useEffect(function () {
     if (currentDictDetail) {
+      var _currentDictDetail$di;
       dictForm.setFieldsValue({
-        name: currentDictDetail.name,
+        dictName: currentDictDetail.dictName,
         remark: currentDictDetail.remark
       });
-      setDictList(currentDictDetail.dictValue.map(function (res) {
+      setDictList((_currentDictDetail$di = currentDictDetail.dictValue) === null || _currentDictDetail$di === void 0 ? void 0 : _currentDictDetail$di.split(',').map(function (res) {
         return {
           name: res,
           key: Math.random() * 10000
@@ -155,10 +157,7 @@ var clearDict = function clearDict(_ref) {
     title: /*#__PURE__*/React.createElement("div", null, currentDictDetail ? '修改' : '创建', "\u5C5E\u6027\u5B57\u5178", /*#__PURE__*/React.createElement("div", {
       className: "clearDict-drawerCloseIcon",
       onClick: onClose
-    }, /*#__PURE__*/React.createElement(CloseOutlined, {
-      onPointerEnterCapture: undefined,
-      onPointerLeaveCapture: undefined
-    }))),
+    }, /*#__PURE__*/React.createElement(CloseOutlined, null))),
     onClose: onClose,
     closeIcon: false,
     open: open,
@@ -179,22 +178,22 @@ var clearDict = function clearDict(_ref) {
       span: 20
     },
     initialValues: {
-      name: '',
+      dictName: '',
       desctiption: ''
     },
     onFinish: onFinish,
     labelAlign: "right"
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u5C5E\u6027\u503C",
-    name: "name",
+    label: "\u5C5E\u6027\u5B57\u5178\u540D",
+    name: "dictName.",
     rules: [{
       required: true,
-      message: '请输入属性值'
+      message: '请输入属性字典名'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     showCount: true,
     maxLength: 50,
-    placeholder: "\u8BF7\u8F93\u5165\u5C5E\u6027\u503C"
+    placeholder: "\u8BF7\u8F93\u5165\u5C5E\u6027\u5B57\u5178\u540D"
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5907\u6CE8",
     name: "remark"
@@ -214,7 +213,7 @@ var clearDict = function clearDict(_ref) {
     columns: columns,
     pagination: false,
     scroll: {
-      y: 396
+      y: 'calc(100vh - 430px)'
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "clearDict-addListBtn"
@@ -232,7 +231,13 @@ var clearDict = function clearDict(_ref) {
       setOpenImportModal(false);
     },
     onSuccess: function onSuccess(result) {
-      console.log(result);
+      setDictList([].concat(_toConsumableArray(dictList), _toConsumableArray(result.map(function (res) {
+        return {
+          name: res,
+          key: Math.random() * 10000
+        };
+      }))));
+      setOpenImportModal(false);
     }
   })));
 };

package/es/modules/systemSetting/dictionaryItem/dictionaryManagement/css/index.less

@@ -1,47 +1,48 @@
-.clearDict {
-  height: 100%;
-  padding: 24px;
-  background: #fff;
-  border-radius: 8px;
-  border-radius: 8px;
-  &-searchTop {
-    display: grid;
-    grid-template-columns: 1fr;
-    align-items: center;
-    justify-items: self-end;
-    margin-bottom: 20px;
-  }
-  &-modal {
-    .ant-modal-body {
-      height: 350px;
-    }
-    .ant-picker-dropdown {
-      top: 133px !important;
-      left: 13px !important;
-    }
-  }
-  &-content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  &-drawerCloseIcon {
-    float: right;
-    cursor: pointer;
-  }
-  &-addListBtn {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 20px;
-  }
-  &-tableContainer {
-    margin-top: 10px;
-    .ant-table {
-      min-height: 448px !important; /* 设置表格最小高度 */
-    }
-    .ant-empty-normal {
-      height: 299px; /* 设置表格最小高度 */
-    }
-  }
-}
+.clearDict {
+  height: 100%;
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+  border-radius: 8px;
+  &-searchTop {
+    display: grid;
+    grid-template-columns: 1fr;
+    align-items: center;
+    justify-items: self-end;
+    margin-bottom: 20px;
+  }
+  &-modal {
+    .ant-modal-body {
+      height: 350px;
+    }
+    .ant-picker-dropdown {
+      top: 133px !important;
+      left: 13px !important;
+    }
+  }
+  &-content {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  &-drawerCloseIcon {
+    float: right;
+    cursor: pointer;
+  }
+  &-addListBtn {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 20px;
+  }
+  &-tableContainer {
+    margin-top: 10px;
+    .ant-table {
+      height: calc(100vh - 380px);
+      min-height: 410px !important; /* 设置表格最小高度 */
+    }
+    .ant-empty-normal {
+      height: 260px; /* 设置表格最小高度 */
+    }
+  }
+}

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

@@ -36,9 +36,9 @@ var DictionaryManagement = function DictionaryManagement() {
     },
     width: 80
   }, {
-    title: '字典名',
-    dataIndex: 'name',
-    key: 'name',
+    title: '属性字典名',
+    dataIndex: 'dictName',
+    key: 'dictName',
     render: function render(text) {
       return /*#__PURE__*/React.createElement(Tooltip, {
         title: text
@@ -53,8 +53,8 @@ var DictionaryManagement = function DictionaryManagement() {
     }
   }, {
     title: '创建人',
-    dataIndex: 'createUser',
-    key: 'createUser',
+    dataIndex: 'creatorName',
+    key: 'creatorName',
     width: 140
   }, {
     title: '备注',
@@ -98,6 +98,7 @@ var DictionaryManagement = function DictionaryManagement() {
     setAddDictShow = _useState4[1];
   var handleAddDict = function handleAddDict() {
     setAddDictShow(true);
+    setDictDetail(undefined);
   };
   /**
    * 字典列表， 搜索名称 删除字典
@@ -123,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,
@@ -133,7 +134,7 @@ var DictionaryManagement = function DictionaryManagement() {
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        setDictList(res.data.data);
+        setDictList(res.data.dictList);
         // 总页数
         setTableParams(function (pre) {
           return _objectSpread(_objectSpread({}, pre), {}, {

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

@@ -1,8 +1,8 @@
 export interface DictDetailType {
     id: number;
-    name: string;
+    dictName: string;
     remark: string;
-    dictValue: string[];
+    dictValue: string;
 }
 export interface DictList {
     name: string;

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: '备注',
@@ -151,18 +151,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 +245,13 @@ 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);
+    }
   })));
 };
 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.2",
+  "version": "2.1.0-zhongyuan.4",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d567e909df16d3e8b1fdea55cb831c0085e779fe",
+  "gitHead": "4767afec1ef7fe458973efa32bf1195c4cc2c93c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }