@zgfe/modules-settings 2.0.0-zhongyuan.5 → 2.0.0-zhongyuan.6

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;
@@ -66,19 +67,19 @@ var DocumentSetting = function DocumentSetting() {
     title: '序号',
     dataIndex: 'index',
     key: 'index',
+    width: 80,
     render: function render(_, obj, index) {
       return index + 1;
     }
   }, {
     title: '文档名称',
     dataIndex: 'name',
-    key: 'name',
-    with: 260
+    key: 'name'
   }, {
     title: '创建时间',
     dataIndex: 'createdTime',
     key: 'createdTime',
-    with: 200,
+    width: 200,
     sorter: function sorter(a, b) {
       return moment(b.createdTime).valueOf() - moment(a.createdTime).valueOf();
     },
@@ -88,7 +89,7 @@ var DocumentSetting = function DocumentSetting() {
   }, {
     title: '操作',
     key: 'operation',
-    with: 120,
+    width: 170,
     render: function render(_, record) {
       return /*#__PURE__*/React.createElement(Space, {
         size: "middle"
@@ -182,6 +183,7 @@ var DocumentSetting = function DocumentSetting() {
     isOpenUploadModal = _useState10[0],
     setIsOpenUploadModal = _useState10[1];
   var handleValueCancel = function handleValueCancel() {
+    setFileList(undefined);
     setIsOpenUploadModal(false);
     setDocumentFlagLoading(false);
   };
@@ -191,25 +193,34 @@ var DocumentSetting = function DocumentSetting() {
     setFileList = _useState12[1];
   var props = {
     name: 'file',
-    multiple: true,
+    maxCount: 1,
+    accept: '.zip,.rar,.7z',
     beforeUpload: beforeUpload,
     onChange: function onChange(info) {
       console.log(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, {
@@ -378,6 +389,7 @@ var DocumentSetting = function DocumentSetting() {
     title: "\u4E0A\u4F20",
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",
+    destroyOnClose: true,
     open: isOpenUploadModal,
     onCancel: handleValueCancel,
     onOk: saveFile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.5",
+  "version": "2.0.0-zhongyuan.6",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",