@zgfe/modules-settings 2.0.0-zhongyuan.0 → 2.0.0-zhongyuan.10

package/es/modules/systemSetting/document-setting/index.js

@@ -25,15 +25,16 @@ var Dragger = Upload.Dragger;
 var pageName = 'DocumentSetting';
 var confirm = Modal.confirm;
 var beforeUpload = function beforeUpload(file) {
-  var isJpgOrPng = file.type == 'application/x-zip-compressed' || file.type == 'application/x-compressed';
-  if (!isJpgOrPng) {
-    message.error('只能传入是ZIP或者RAR文件');
-  }
+  // const isJpgOrPng =
+  //   file.type == 'application/x-zip-compressed' || file.type == 'application/x-compressed';
+  // if (!isJpgOrPng) {
+  //   message.error('只能传入是ZIP或者RAR文件');
+  // }
   var isLt2M = file.size / 1024 / 1024 < 100;
   if (!isLt2M) {
     message.error('文件不能大于100M');
   }
-  return isJpgOrPng && isLt2M;
+  return isLt2M;
 };
 var downloadFile = function downloadFile(resData, name) {
   var blob = resData.data;
@@ -53,16 +54,20 @@ var DocumentSetting = function DocumentSetting() {
   var _useContext = useContext(BizGlobalDataContext),
     projectList = _useContext.projectList,
     currentUser = _useContext.currentUser;
-  console.log(currentUser, 'currentUser');
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     documentList = _useState2[0],
     setDocumentList = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    newDocumentList = _useState4[0],
+    setNewDocumentList = _useState4[1];
   var currentObj = useRef();
   var columns = [{
     title: '序号',
     dataIndex: 'index',
     key: 'index',
+    width: 80,
     render: function render(_, obj, index) {
       return index + 1;
     }
@@ -74,6 +79,7 @@ var DocumentSetting = function DocumentSetting() {
     title: '创建时间',
     dataIndex: 'createdTime',
     key: 'createdTime',
+    width: 200,
     sorter: function sorter(a, b) {
       return moment(b.createdTime).valueOf() - moment(a.createdTime).valueOf();
     },
@@ -83,6 +89,7 @@ var DocumentSetting = function DocumentSetting() {
   }, {
     title: '操作',
     key: 'operation',
+    width: 170,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
         size: "middle"
@@ -162,47 +169,57 @@ var DocumentSetting = function DocumentSetting() {
       }
     });
   };
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    documentFlagLoading = _useState4[0],
-    setDocumentFlagLoading = _useState4[1];
-  var _useState5 = useState(''),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchValue = _useState6[0],
-    setSearchValue = _useState6[1];
-  // 文件上传
-  var _useState7 = useState(false),
+    documentFlagLoading = _useState6[0],
+    setDocumentFlagLoading = _useState6[1];
+  var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
-    isOpenUploadModal = _useState8[0],
-    setIsOpenUploadModal = _useState8[1];
+    searchValue = _useState8[0],
+    setSearchValue = _useState8[1];
+  // 文件上传
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isOpenUploadModal = _useState10[0],
+    setIsOpenUploadModal = _useState10[1];
   var handleValueCancel = function handleValueCancel() {
+    setFileList(undefined);
     setIsOpenUploadModal(false);
     setDocumentFlagLoading(false);
   };
-  var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    fileList = _useState10[0],
-    setFileList = _useState10[1];
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    fileList = _useState12[0],
+    setFileList = _useState12[1];
   var props = {
     name: 'file',
-    multiple: true,
+    maxCount: 1,
+    accept: '.zip,.rar,.7z',
     beforeUpload: beforeUpload,
     onChange: function onChange(info) {
       var status = info.file.status;
       if (status !== 'uploading') {
-        console.log(info.file, info.fileList);
+        if (info.fileList.length > 0) {
+          setFileList(info.fileList[0].originFileObj);
+        }
       }
-      if (status === 'done') {
-        setFileList(info.fileList[0].originFileObj);
-      } else if (status === 'error') {
-        message.error("".concat(info.file.name, " file upload failed."));
+      if (status == 'removed') {
+        setFileList(undefined);
       }
+      // if (status === 'done') {
+      // } else if (status === 'error') {
+      //   message.error(`${info.file.name} file upload failed.`);
+      // }
     },
     onDrop: function onDrop(e) {
       console.log('Dropped files', e.dataTransfer.files);
     }
   };
   var saveFile = function saveFile() {
+    if (!fileList) {
+      message.error('请选择上传的文件');
+      return;
+    }
     var formData = new FormData();
     formData.append('file', fileList);
     request(apis.setting.uploadDocumentFile, {
@@ -220,26 +237,26 @@ var DocumentSetting = function DocumentSetting() {
     });
   };
   // 共享  分享类型 1指定应用 2指定成员 3仅自己 4所有成员
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isOpenShareModal = _useState12[0],
-    setIsOpenShareModal = _useState12[1];
-  var _useState13 = useState(),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    currentShareType = _useState14[0],
-    setCurrentShareType = _useState14[1];
-  var _useState15 = useState([]),
+    isOpenShareModal = _useState14[0],
+    setIsOpenShareModal = _useState14[1];
+  var _useState15 = useState(4),
     _useState16 = _slicedToArray(_useState15, 2),
-    adminOptionList = _useState16[0],
-    setAdminOptionList = _useState16[1]; // 成员列表
+    currentShareType = _useState16[0],
+    setCurrentShareType = _useState16[1];
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    currentAppArr = _useState18[0],
-    setCurrentAppArr = _useState18[1]; // 选中的应用id
+    adminOptionList = _useState18[0],
+    setAdminOptionList = _useState18[1]; // 成员列表
   var _useState19 = useState([]),
     _useState20 = _slicedToArray(_useState19, 2),
-    currentUserArr = _useState20[0],
-    setCurrentUserArr = _useState20[1]; // 选中的成员id
+    currentAppArr = _useState20[0],
+    setCurrentAppArr = _useState20[1]; // 选中的应用id
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    currentUserArr = _useState22[0],
+    setCurrentUserArr = _useState22[1]; // 选中的成员id
   var handleShareCancel = function handleShareCancel() {
     setIsOpenShareModal(false);
     setCurrentUserArr([]);
@@ -294,16 +311,30 @@ var DocumentSetting = function DocumentSetting() {
   };
   var saveShare = function saveShare() {
     var _currentObj$current4;
+    var currentId = undefined;
+    if (currentShareType == 1) {
+      // 应用
+      var a = projectList.filter(function (o) {
+        return currentAppArr.includes(o.projectId);
+      });
+      currentId = a.map(function (o) {
+        var _o$appList, _o$appList$;
+        return (_o$appList = o.appList) === null || _o$appList === void 0 ? void 0 : (_o$appList$ = _o$appList[0]) === null || _o$appList$ === void 0 ? void 0 : _o$appList$.appId;
+      });
+    } else if (currentShareType == 2) {
+      // 用户
+      currentId = currentUserArr;
+    }
     request(apis.setting.shareAPP, {
       method: 'post',
       data: {
         type: currentShareType,
         id: (_currentObj$current4 = currentObj.current) === null || _currentObj$current4 === void 0 ? void 0 : _currentObj$current4.id,
-        shareIds: currentShareType == 1 ? currentAppArr : currentUserArr
+        shareIds: currentId
       }
     }).then(function (res) {
       if (res && (res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.error('分享成功！');
+        message.success('分享成功！');
         handleShareCancel();
       } else {
         message.error('查询失败，联系管理员');
@@ -312,7 +343,12 @@ var DocumentSetting = function DocumentSetting() {
       setDocumentFlagLoading(false);
     });
   };
-  // end
+  useEffect(function () {
+    var searchList = searchValue ? documentList.filter(function (o) {
+      return o.name.includes(searchValue);
+    }) : documentList;
+    setNewDocumentList(searchList);
+  }, [documentList, searchValue]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(pageName),
     id: "DocumentSetting1",
@@ -346,9 +382,9 @@ var DocumentSetting = function DocumentSetting() {
     value: searchValue,
     onChange: function onChange(e) {
       (e === null || e === void 0 ? void 0 : e.target) && setSearchValue(function () {
-        var _e$target, _e$target2;
-        getFileList(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
-        return e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value;
+        var _e$target;
+        // getFileList(e?.target?.value);
+        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, {
@@ -357,14 +393,16 @@ var DocumentSetting = function DocumentSetting() {
       return setIsOpenUploadModal(true);
     }
   }, "\u4E0A\u4F20")), /*#__PURE__*/React.createElement(Table, {
+    key: 'id',
     columns: columns,
     loading: documentFlagLoading,
-    dataSource: documentList,
+    dataSource: newDocumentList,
     pagination: false
   }))), /*#__PURE__*/React.createElement(Modal, {
     title: "\u4E0A\u4F20",
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",
+    destroyOnClose: true,
     open: isOpenUploadModal,
     onCancel: handleValueCancel,
     onOk: saveFile
@@ -407,9 +445,9 @@ var DocumentSetting = function DocumentSetting() {
     size: 20
   }, /*#__PURE__*/React.createElement(Radio, {
     value: 4
-  }, "\u6240\u4EE5\u6210\u5458"), /*#__PURE__*/React.createElement(Radio, {
+  }, "\u6240\u6709\u6210\u5458"), /*#__PURE__*/React.createElement(Radio, {
     value: 1
-  }, "\u6307\u5B9A\u5E94\u7528\uFF08\u6240\u6709\u62E5\u6709\u8BE5\u5E94\u7528\u6743\u9650\u7684\u89D2\u8272\uFF09"), currentShareType == 1 ? (/*#__PURE__*/React.createElement(React.Fragment, null, currentAppArr.length > 2 ? (/*#__PURE__*/React.createElement(Tooltip, {
+  }, "\u6307\u5B9A\u5E94\u7528\uFF08\u6240\u6709\u62E5\u6709\u8BE5\u5E94\u7528\u6743\u9650\u7684\u89D2\u8272\uFF09"), currentShareType == 1 ? (/*#__PURE__*/React.createElement(React.Fragment, null, currentAppArr.length > 0 ? (/*#__PURE__*/React.createElement(Tooltip, {
     title: function title() {
       return projectList.filter(function (o) {
         return currentAppArr.includes(o.projectId);

package/es/modules/systemSetting/index.css

@@ -1,161 +1,161 @@
-.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;
-}
-.DictionaryPage-emptyDom-img {
-  display: block;
-  width: 248px;
-  height: 200px;
-  margin: auto;
-  background-image: url('img/empty-data.png');
-  background-size: 100%;
-}
-.DictionaryPage-emptyDom-tip {
-  margin: 0px 0px 10px;
-  color: #999;
-}
-.DictionaryPage .ant-tabs-nav {
-  padding-right: 10%;
-}
-.DictionaryPage-header {
-  position: relative;
-}
-.DictionaryPage-header-search {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 0px 0px 16px;
-}
-.DictionaryPage-header-search .ant-btn {
-  color: #407fff;
-  border-color: #407fff;
-}
-.DictionaryPage-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;
-}
-.DictionaryPage-modal {
-  color: #021429;
-}
-.DictionaryPage-modal-header {
-  height: 50px;
-  padding: 0px 16px;
-  line-height: 50px;
-  background-color: #f2f3f4;
-}
-.DictionaryPage-modal-header-left {
-  display: inline-block;
-  width: 80%;
-  vertical-align: middle;
-}
-.DictionaryPage-modal-header-operation {
-  display: inline-block;
-  width: 20%;
-  text-align: center;
-  vertical-align: middle;
-}
-.DictionaryPage-modal .ant-input-affix-wrapper {
-  vertical-align: middle;
-}
-.DictionaryPage-modal .DictionaryPage-modal-content {
-  padding: 10px 16px 0px;
-}
-.DictionaryPage-modal-content {
-  height: 292px;
-  overflow-y: auto;
-}
-.DictionaryPage-modal-content-item {
-  display: flex;
-  align-items: center;
-  height: 50px;
-  line-height: 50px;
-  border-bottom: 1px solid #f2f3f4;
-}
-.DictionaryPage-modal-content-itemLeft {
-  position: relative;
-  display: inline-block;
-  flex: 1;
-  height: 100%;
-}
-.DictionaryPage-modal-content-itemLeft .error-tip {
-  position: absolute;
-  bottom: -28px;
-  left: 3px;
-  width: 100%;
-  color: red;
-  font-size: 14px;
-  letter-spacing: 1px;
-}
-.DictionaryPage-modal-content-itemRight {
-  display: inline-block;
-  width: 40px;
-  color: #165dff;
-  text-align: center;
-  cursor: pointer;
-}
-.DictionaryPage-modal-content .ant-typography.ant-typography-ellipsis.ant-typography-single-line {
-  height: 50px;
-  margin-bottom: 0px;
-  line-height: 50px;
-  border-bottom: 1px solid #f2f3f4;
-}
-.DictionaryPage-modal-content .ant-typography-edit {
-  float: right;
-  width: 20%;
-  text-align: center;
-}
-.DictionaryPage-modal-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;
-}
-.DocumentSetting-search {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 16px 0px 16px;
-}
-.DocumentSetting-emptyDom {
-  margin: 50px 0px 0px;
-  text-align: center;
-}
-.DocumentSetting-emptyDom-img {
-  display: block;
-  width: 248px;
-  height: 200px;
-  margin: auto;
-  background-image: url('img/empty-data.png');
-  background-size: 100%;
-}
-.DocumentSetting-emptyDom-tip {
-  margin: 0px 0px 10px;
-  color: #999;
-}
+.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;
+}
+.DictionaryPage-emptyDom-img {
+  display: block;
+  width: 248px;
+  height: 200px;
+  margin: auto;
+  background-image: url('img/empty-data.png');
+  background-size: 100%;
+}
+.DictionaryPage-emptyDom-tip {
+  margin: 0px 0px 10px;
+  color: #999;
+}
+.DictionaryPage .ant-tabs-nav {
+  padding-right: 10%;
+}
+.DictionaryPage-header {
+  position: relative;
+}
+.DictionaryPage-header-search {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 0px 0px 16px;
+}
+.DictionaryPage-header-search .ant-btn {
+  color: #407fff;
+  border-color: #407fff;
+}
+.DictionaryPage-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;
+}
+.DictionaryPage-modal {
+  color: #021429;
+}
+.DictionaryPage-modal-header {
+  height: 50px;
+  padding: 0px 16px;
+  line-height: 50px;
+  background-color: #f2f3f4;
+}
+.DictionaryPage-modal-header-left {
+  display: inline-block;
+  width: 80%;
+  vertical-align: middle;
+}
+.DictionaryPage-modal-header-operation {
+  display: inline-block;
+  width: 20%;
+  text-align: center;
+  vertical-align: middle;
+}
+.DictionaryPage-modal .ant-input-affix-wrapper {
+  vertical-align: middle;
+}
+.DictionaryPage-modal .DictionaryPage-modal-content {
+  padding: 10px 16px 0px;
+}
+.DictionaryPage-modal-content {
+  height: 292px;
+  overflow-y: auto;
+}
+.DictionaryPage-modal-content-item {
+  display: flex;
+  align-items: center;
+  height: 50px;
+  line-height: 50px;
+  border-bottom: 1px solid #f2f3f4;
+}
+.DictionaryPage-modal-content-itemLeft {
+  position: relative;
+  display: inline-block;
+  flex: 1;
+  height: 100%;
+}
+.DictionaryPage-modal-content-itemLeft .error-tip {
+  position: absolute;
+  bottom: -28px;
+  left: 3px;
+  width: 100%;
+  color: red;
+  font-size: 14px;
+  letter-spacing: 1px;
+}
+.DictionaryPage-modal-content-itemRight {
+  display: inline-block;
+  width: 40px;
+  color: #165dff;
+  text-align: center;
+  cursor: pointer;
+}
+.DictionaryPage-modal-content .ant-typography.ant-typography-ellipsis.ant-typography-single-line {
+  height: 50px;
+  margin-bottom: 0px;
+  line-height: 50px;
+  border-bottom: 1px solid #f2f3f4;
+}
+.DictionaryPage-modal-content .ant-typography-edit {
+  float: right;
+  width: 20%;
+  text-align: center;
+}
+.DictionaryPage-modal-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;
+}
+.DocumentSetting-search {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 16px 0px 16px;
+}
+.DocumentSetting-emptyDom {
+  margin: 50px 0px 0px;
+  text-align: center;
+}
+.DocumentSetting-emptyDom-img {
+  display: block;
+  width: 248px;
+  height: 200px;
+  margin: auto;
+  background-image: url('img/empty-data.png');
+  background-size: 100%;
+}
+.DocumentSetting-emptyDom-tip {
+  margin: 0px 0px 10px;
+  color: #999;
+}

package/es/modules/systemSetting/index.js

@@ -9,6 +9,7 @@ import { DesktopOutlined } from '@ant-design/icons';
 import Notice from './notice';
 import Approvalmanage from './approvalmanage';
 import SettingTabs from '../../components/settingTabs';
+import Dictionary from './Dictionary';
 import { DemoManage } from '@zgfe/modules-demo-manage';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import CreateProcess from '../createProcess';
@@ -72,13 +73,11 @@ var SystemSetting = function SystemSetting(_ref) {
     key: '5',
     label: '接口管理',
     content: /*#__PURE__*/React.createElement(AuthUrl, null)
-  },
-  // {
-  //   key: '6',
-  //   label: '字典管理',
-  //   content: <Dictionary />,
-  // },
-  {
+  }, {
+    key: '6',
+    label: '字典管理',
+    content: /*#__PURE__*/React.createElement(Dictionary, null)
+  }, {
     key: '7',
     label: '文档库',
     content: /*#__PURE__*/React.createElement(DocumentSetting, null)