@zgfe/modules-settings 2.1.0-zhongyuan.9 → 3.0.0-zhongyuan-set.0

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

@@ -22,7 +22,8 @@ var clearDict = function clearDict(_ref) {
     onSetclose = _ref.onSetclose,
     currentDictDetail = _ref.currentDictDetail;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    showProdDownload = _useContext.showProdDownload;
   var _useState = useState(addDictShow),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -220,10 +221,10 @@ var clearDict = function clearDict(_ref) {
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: onHandlePush
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u6DFB\u52A0\u503C"), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u6DFB\u52A0\u503C"), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: onHandleUploading
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u4ECE\u6587\u4EF6\u6DFB\u52A0"))), openImportModal && (/*#__PURE__*/React.createElement(ImportMetaDialog, {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), "\u4ECE\u6587\u4EF6\u6DFB\u52A0")))), openImportModal && (/*#__PURE__*/React.createElement(ImportMetaDialog, {
     uploadFile: apis.dict.dictUpload,
     downloadTempleUrl: apis.dict.dictTemplate,
     fileName: "\u5C5E\u6027\u503C\u5BFC\u5165\u6A21\u677F",

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

@@ -1,48 +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 {
-      height: calc(100vh - 380px);
-      min-height: 410px !important; /* 设置表格最小高度 */
-    }
-    .ant-empty-normal {
-      height: 260px; /* 设置表格最小高度 */
-    }
-  }
-}
+.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/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',
@@ -100,6 +101,7 @@ var locationTagManagement = function locationTagManagement(_ref) {
     addLocShow = _useState4[0],
     setAddlocShow = _useState4[1];
   var handleAddLoc = function handleAddLoc() {
+    setDetail(undefined);
     setAddlocShow(true);
   };
   // 导入标签
@@ -124,6 +126,7 @@ var locationTagManagement = function locationTagManagement(_ref) {
     exportLoading = _useState10[0],
     setExportLoading = _useState10[1];
   var onExport = function onExport() {
+    var fileNames = ['位置标签列表', '业务标签列表', '触发标签列表'];
     if (exportLoading) return;
     setExportLoading(true);
     request(apis.dict.tagDownload, {
@@ -132,7 +135,8 @@ var locationTagManagement = function locationTagManagement(_ref) {
         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 () {
@@ -211,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, {

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/es/modules/systemSetting/index.less

@@ -1,169 +1,175 @@
-.system-setting-approval-process-create-bg {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 10;
-  background: #fafafb;
-}
-.authUrlPageClass {
-  &-search {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 0px 0px 16px;
-  }
-}
-.DictionaryPage {
-  &-emptyDom {
-    margin: 50px 0px 0px;
-    text-align: center;
-    &-img {
-      display: block;
-      width: 248px;
-      height: 200px;
-      margin: auto;
-      background-image: url('./img/empty-data.png');
-      background-size: 100%;
-    }
-    &-tip {
-      margin: 0px 0px 10px;
-      color: #999;
-    }
-  }
-  .ant-tabs-nav {
-    padding-right: 10%;
-  }
-  &-header {
-    position: relative;
-    &-search {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 0px 0px 16px;
-      .ant-btn {
-        color: #407fff;
-        border-color: #407fff;
-      }
-    }
-  }
-  &-tabsRight-text {
-    position: absolute;
-    top: 13%;
-    right: 0;
-    width: 10%;
-    color: #165dff;
-    text-align: center;
-    vertical-align: middle;
-    border-left: 1px solid #ccc;
-    cursor: pointer;
-  }
-  &-modal {
-    color: #021429;
-    &-header {
-      height: 50px;
-      padding: 0px 16px;
-      line-height: 50px;
-      background-color: #f2f3f4;
-      &-left {
-        display: inline-block;
-        width: 80%;
-        vertical-align: middle;
-      }
-      &-operation {
-        display: inline-block;
-        width: 20%;
-        text-align: center;
-        vertical-align: middle;
-      }
-    }
-    .ant-input-affix-wrapper {
-      vertical-align: middle;
-    }
-    .DictionaryPage-modal-content {
-      padding: 10px 16px 0px;
-    }
-    &-content {
-      height: 292px;
-      overflow-y: auto;
-      &-item {
-        display: flex;
-        align-items: center;
-        height: 50px;
-        line-height: 50px;
-        border-bottom: 1px solid #f2f3f4;
-      }
-      &-itemLeft {
-        position: relative;
-        display: inline-block;
-        flex: 1;
-        height: 100%;
-        .error-tip {
-          position: absolute;
-          bottom: -28px;
-          left: 3px;
-          width: 100%;
-          color: red;
-          font-size: 14px;
-          letter-spacing: 1px;
-        }
-      }
-      &-itemRight {
-        display: inline-block;
-        width: 40px;
-        color: #165dff;
-        text-align: center;
-        cursor: pointer;
-      }
-      .ant-typography.ant-typography-ellipsis.ant-typography-single-line {
-        height: 50px;
-        margin-bottom: 0px;
-        line-height: 50px;
-        border-bottom: 1px solid #f2f3f4;
-      }
-      .ant-typography-edit {
-        float: right;
-        width: 20%;
-        text-align: center;
-      }
-    }
-    &-footer {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 16px 0px;
-    }
-  }
-}
-
-// 文档库管理
-.DocumentSetting {
-  &-header {
-    height: 48px;
-    line-height: 48px;
-    border-bottom: 1px solid #e8efff;
-  }
-  &-search {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 16px 0px 16px;
-  }
-  &-emptyDom {
-    margin: 50px 0px 0px;
-    text-align: center;
-    &-img {
-      display: block;
-      width: 248px;
-      height: 200px;
-      margin: auto;
-      background-image: url('./img/empty-data.png');
-      background-size: 100%;
-    }
-    &-tip {
-      margin: 0px 0px 10px;
-      color: #999;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.system-setting-approval-process-create-bg {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 10;
+  background: #fafafb;
+}
+.authUrlPageClass {
+  &-search {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 0px 0px 16px;
+  }
+}
+.DictionaryPage {
+  &-emptyDom {
+    margin: 50px 0px 0px;
+    text-align: center;
+    &-img {
+      display: block;
+      width: 248px;
+      height: 200px;
+      margin: auto;
+      background-image: url('./img/empty-data.png');
+      background-size: 100%;
+    }
+    &-tip {
+      margin: 0px 0px 10px;
+      color: #999;
+    }
+  }
+  .ant-tabs-nav {
+    padding-right: 10%;
+  }
+  &-header {
+    position: relative;
+    &-search {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 0px 0px 16px;
+      .ant-btn {
+        color: #407fff;
+        border-color: #407fff;
+      }
+    }
+  }
+  &-tabsRight-text {
+    position: absolute;
+    top: 13%;
+    right: 0;
+    width: 10%;
+    color: #165dff;
+    text-align: center;
+    vertical-align: middle;
+    border-left: 1px solid #ccc;
+    cursor: pointer;
+  }
+  &-modal {
+    color: #021429;
+    &-header {
+      height: 50px;
+      padding: 0px 16px;
+      line-height: 50px;
+      background-color: #f2f3f4;
+      &-left {
+        display: inline-block;
+        width: 80%;
+        vertical-align: middle;
+      }
+      &-operation {
+        display: inline-block;
+        width: 20%;
+        text-align: center;
+        vertical-align: middle;
+      }
+    }
+    .ant-input-affix-wrapper {
+      vertical-align: middle;
+    }
+    .DictionaryPage-modal-content {
+      padding: 10px 16px 0px;
+    }
+    &-content {
+      height: 292px;
+      overflow-y: auto;
+      &-item {
+        display: flex;
+        align-items: center;
+        height: 50px;
+        line-height: 50px;
+        border-bottom: 1px solid #f2f3f4;
+      }
+      &-itemLeft {
+        position: relative;
+        display: inline-block;
+        flex: 1;
+        height: 100%;
+        .error-tip {
+          position: absolute;
+          bottom: -28px;
+          left: 3px;
+          width: 100%;
+          color: red;
+          font-size: 14px;
+          letter-spacing: 1px;
+        }
+      }
+      &-itemRight {
+        display: inline-block;
+        width: 40px;
+        color: #165dff;
+        text-align: center;
+        cursor: pointer;
+      }
+      .ant-typography.ant-typography-ellipsis.ant-typography-single-line {
+        height: 50px;
+        margin-bottom: 0px;
+        line-height: 50px;
+        border-bottom: 1px solid #f2f3f4;
+      }
+      .ant-typography-edit {
+        float: right;
+        width: 20%;
+        text-align: center;
+      }
+    }
+    &-footer {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 16px 0px;
+    }
+  }
+}
+
+// 文档库管理
+.DocumentSetting {
+  &-header {
+    height: 48px;
+    line-height: 48px;
+    border-bottom: 1px solid #e8efff;
+  }
+  &-search {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 16px 0px 16px;
+    .ant-input {
+      &:focus {
+        border-color: @primary-color !important;
+      }
+    }
+  }
+  &-emptyDom {
+    margin: 50px 0px 0px;
+    text-align: center;
+    &-img {
+      display: block;
+      width: 248px;
+      height: 200px;
+      margin: auto;
+      background-image: url('./img/empty-data.png');
+      background-size: 100%;
+    }
+    &-tip {
+      margin: 0px 0px 10px;
+      color: #999;
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.9",
+  "version": "3.0.0-zhongyuan-set.0",
   "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": "3903a4dd85df0af2012958fdf505bc18eac32bd4",
+  "gitHead": "a298f4ad7068dff70f410592495dca58f92c4e71",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }