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

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

@@ -26,7 +26,8 @@ var locationTagManagement = function locationTagManagement(_ref) {
   var title = _ref.title,
     type = _ref.type;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    showProdDownload = _useContext.showProdDownload;
   var columns = [{
     title: '序号',
     dataIndex: 'index',
@@ -40,8 +41,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 +57,8 @@ var locationTagManagement = function locationTagManagement(_ref) {
     }
   }, {
     title: '创建人',
-    dataIndex: 'createUser',
-    key: 'createUser',
+    dataIndex: 'creatorName',
+    key: 'creatorName',
     width: 140
   }, {
     title: '备注',
@@ -100,6 +101,7 @@ var locationTagManagement = function locationTagManagement(_ref) {
     addLocShow = _useState4[0],
     setAddlocShow = _useState4[1];
   var handleAddLoc = function handleAddLoc() {
+    setDetail(undefined);
     setAddlocShow(true);
   };
   // 导入标签
@@ -124,14 +126,17 @@ var locationTagManagement = function locationTagManagement(_ref) {
     exportLoading = _useState10[0],
     setExportLoading = _useState10[1];
   var onExport = function onExport() {
-    if (!exportLoading) return;
+    var fileNames = ['位置标签列表', '业务标签列表', '触发标签列表'];
+    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'
+      responseType: 'blob',
+      fileName: "".concat(fileNames[type - 1], "_").concat(moment().format('YYYYMMDD'))
     }).then(function () {
       setExportLoading(false);
     }).catch(function () {
@@ -151,18 +156,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), {}, {
@@ -210,15 +215,15 @@ var locationTagManagement = function locationTagManagement(_ref) {
     className: "".concat(className)
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(className, "-searchTop")
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(Space, null, showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     onClick: onExport,
     loading: exportLoading
-  }, /*#__PURE__*/React.createElement(ToTopOutlined, null), "\u5BFC\u51FA"), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(ToTopOutlined, null), "\u5BFC\u51FA")), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setOpenImportModal(true);
     }
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u5BFC\u5165", title), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u5BFC\u5165", title)), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: handleAddLoc
   }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u521B\u5EFA", title))), /*#__PURE__*/React.createElement(Table, {
@@ -228,7 +233,8 @@ var locationTagManagement = function locationTagManagement(_ref) {
     columns: columns,
     onChange: handlePage,
     scroll: {
-      x: 992
+      x: 992,
+      y: 390
     }
   }), addLocShow && (/*#__PURE__*/React.createElement(CreateLoc, {
     type: type,
@@ -245,7 +251,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/es/modules/systemSetting/document-setting/index.js

@@ -34,7 +34,7 @@ var beforeUpload = function beforeUpload(file) {
   if (!isLt2M) {
     message.error('文件不能大于100M');
   }
-  return isLt2M;
+  return false;
 };
 var downloadFile = function downloadFile(resData, name) {
   var blob = resData.data;
@@ -53,6 +53,7 @@ var downloadFile = function downloadFile(resData, name) {
 var DocumentSetting = function DocumentSetting() {
   var _useContext = useContext(BizGlobalDataContext),
     projectList = _useContext.projectList,
+    showProdDownload = _useContext.showProdDownload,
     currentUser = _useContext.currentUser;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -93,12 +94,12 @@ var DocumentSetting = function DocumentSetting() {
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
         size: "middle"
-      }, /*#__PURE__*/React.createElement("a", {
+      }, showProdDownload && (/*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           currentObj.current = record;
           exportEvent();
         }
-      }, "\u4E0B\u8F7D"), record.isSharePower == 1 && (/*#__PURE__*/React.createElement("a", {
+      }, "\u4E0B\u8F7D")), record.isSharePower == 1 && (/*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           setIsOpenShareModal(true);
           currentObj.current = record;
@@ -140,7 +141,7 @@ var DocumentSetting = function DocumentSetting() {
               fileName: (_currentObj$current2 = currentObj.current) === null || _currentObj$current2 === void 0 ? void 0 : _currentObj$current2.name,
               isExcel: true
             }).then(function (res) {
-              console.log(res, 'll');
+              console.log(res);
             });
           case 1:
           case "end":
@@ -387,12 +388,12 @@ var DocumentSetting = function DocumentSetting() {
         return e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
       });
     }
-  }), /*#__PURE__*/React.createElement(Button, {
+  }), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setIsOpenUploadModal(true);
     }
-  }, "\u4E0A\u4F20")), /*#__PURE__*/React.createElement(Table, {
+  }, "\u4E0A\u4F20"))), /*#__PURE__*/React.createElement(Table, {
     key: 'id',
     columns: columns,
     loading: documentFlagLoading,

package/es/modules/systemSetting/index.js

@@ -6,7 +6,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useContext, useState } from 'react';
 import { DesktopOutlined } from '@ant-design/icons';
-import Notice from './notice';
 import Approvalmanage from './approvalmanage';
 import SettingTabs from '../../components/settingTabs';
 import Dictionary from './Dictionary';
@@ -23,7 +22,7 @@ var SystemSetting = function SystemSetting(_ref) {
     currentUser = _useContext.currentUser,
     authority = _useContext.authority,
     route = _useContext.route;
-  var _useState = useState(route && route.query && route.query.key ? route.query.key : '1'),
+  var _useState = useState(route && route.query && route.query.key ? route.query.key : '4'),
     _useState2 = _slicedToArray(_useState, 2),
     key = _useState2[0],
     setKey = _useState2[1];
@@ -50,19 +49,18 @@ var SystemSetting = function SystemSetting(_ref) {
     setIsRead(isRead);
     setIsShowProcess(true);
   };
-  var items = [{
-    key: '1',
-    label: '通知配置',
-    content: /*#__PURE__*/React.createElement(Notice, {
-      bizType: 1
-    })
-  }, {
-    key: '3',
-    label: 'kpi通知配置',
-    content: /*#__PURE__*/React.createElement(Notice, {
-      bizType: 2
-    })
-  }, {
+  var items = [
+  // {
+  //   key: '1',
+  //   label: '通知配置',
+  //   content: <Notice bizType={1} />,
+  // },
+  // {
+  //   key: '3',
+  //   label: 'kpi通知配置',
+  //   content: <Notice bizType={2} />,
+  // },
+  {
     key: '4',
     label: '审批管理',
     hidden: !authority[1722839049],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.2",
+  "version": "2.1.0-zhongyuan.21",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -50,7 +50,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.5",
+    "@zgfe/business-lib": "1.2.71-hxd.11",
     "@zgfe/modules-demo-manage": "1.0.5-zhongyuan.0",
     "@zgfe/modules-dm": "1.0.56-zhongyuan.1",
     "antd": "^4.22.6",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d567e909df16d3e8b1fdea55cb831c0085e779fe",
+  "gitHead": "aa46d7fb05bf927eef75e3aa99d526f45daba984",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }