wargerm 0.7.90 → 0.7.91

package/dist/components/Tree/index.d.ts

@@ -4,7 +4,7 @@ export interface ITree extends TreeProps<any> {
     request?: (params: any) => Promise<any>;
     params?: Record<string, any>;
     dataSource?: any[];
-    value: any;
+    value?: any;
     onChange?: (values: any, info: any) => void;
 }
 declare const _default: React.ForwardRefExoticComponent<ITree & React.RefAttributes<unknown>>;

package/dist/index.esm.js

@@ -1,9 +1,9 @@
 import React, { useRef, useEffect, useMemo, useState, useCallback, useImperativeHandle, memo, forwardRef, createRef } from 'react';
 import { cloneDeep, uniqBy, omit, chunk, isEmpty } from 'lodash-es';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
-import { Menu, Dropdown, Button, Input, Upload as Upload$1, Modal as Modal$2, message, InputNumber, DatePicker, Radio, Space, Checkbox, Select, Switch, Tooltip, TreeSelect as TreeSelect$1, Cascader, Tree as Tree$1, Form, Row, Col, Spin, Pagination, Breadcrumb, ConfigProvider, notification } from 'antd';
+import { Menu, Dropdown, Button, Input, Upload as Upload$1, message, InputNumber, DatePicker, Radio, Space, Checkbox, Select, Switch, Tooltip, TreeSelect as TreeSelect$1, Cascader, Tree as Tree$1, Form, Row, Col, Spin, Pagination, Breadcrumb, Modal as Modal$2, ConfigProvider, notification } from 'antd';
 import { createFromIconfontCN, PlusOutlined, CloseCircleOutlined, SearchOutlined, ReloadOutlined, MinusOutlined, FullscreenOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined, LeftOutlined, RightOutlined, CloseOutlined } from '@ant-design/icons';
-import FileViewer from 'react-file-viewer';
+import { encode } from 'js-base64';
 import classnames from 'classnames';
 import zhCN from 'antd/es/date-picker/locale/zh_CN';
 import dayjs, { extend, weekdaysMin } from 'dayjs';
@@ -2333,6 +2333,7 @@ WInput.defaultProps = {};
 
 var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
 var Dragger = Upload$1.Dragger;
+// import FileViewer from 'react-file-viewer';
 function Index$1(_ref, ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
@@ -2372,33 +2373,7 @@ function Index$1(_ref, ref) {
       return file.url;
     }), fileList);
   }, [fileList]);
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    previewVisible = _useState6[0],
-    setPreviewVisible = _useState6[1];
-  var _useState7 = useState(''),
-    _useState8 = _slicedToArray(_useState7, 2),
-    previewImage = _useState8[0],
-    setPreviewImage = _useState8[1];
-  var _useState9 = useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    previewTitle = _useState10[0],
-    setPreviewTitle = _useState10[1];
-  var getBase64 = function getBase64(file) {
-    return new Promise(function (resolve, reject) {
-      var reader = new FileReader();
-      reader.readAsDataURL(file);
-      reader.onload = function () {
-        return resolve(reader.result);
-      };
-      reader.onerror = function (error) {
-        return reject(error);
-      };
-    });
-  };
-  var handleCancel = function handleCancel() {
-    return setPreviewVisible(false);
-  };
+  // const handleCancel = () => setPreviewVisible(false);
   var beforeUploadIn = function beforeUploadIn(file) {
     var defaultHandler = function defaultHandler(file) {
       var isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
@@ -2443,15 +2418,16 @@ function Index$1(_ref, ref) {
   }();
   var request = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
-      var onSuccess, onError, file, onProgress, url, fileObj;
+      var onSuccess, onError, file, onProgress, objectUrl, url, fileObj;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             onSuccess = options.onSuccess, onError = options.onError, file = options.file, onProgress = options.onProgress;
             _context2.prev = 1;
-            _context2.next = 4;
-            return fetchMethod ? fetchMethod(file) : getBase64(file);
-          case 4:
+            objectUrl = window.URL.createObjectURL(file); // const url = await (fetchMethod ? fetchMethod(file as RcFile) : getBase64(file as RcFile));
+            _context2.next = 5;
+            return fetchMethod ? fetchMethod(file) : objectUrl;
+          case 5:
             url = _context2.sent;
             if (url) {
               fileObj = {
@@ -2466,20 +2442,20 @@ function Index$1(_ref, ref) {
               // setFileList(newFileList);
               onSuccess(url, file);
             }
-            _context2.next = 12;
+            _context2.next = 13;
             break;
-          case 8:
-            _context2.prev = 8;
+          case 9:
+            _context2.prev = 9;
             _context2.t0 = _context2["catch"](1);
             console.log("Eroor: ", _context2.t0);
             onError({
               err: _context2.t0
             });
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[1, 8]]);
+      }, _callee2, null, [[1, 9]]);
     }));
     return function request(_x2) {
       return _ref4.apply(this, arguments);
@@ -2501,23 +2477,25 @@ function Index$1(_ref, ref) {
   };
   var handlePreview = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(file) {
-      var _file$name$indexOf, _file$name, _file$url$indexOf, _file$url;
+      var objectUrl;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            if (!(!file.url && !file.preview)) {
-              _context3.next = 4;
-              break;
+            if (!file.url && !file.preview) {
+              objectUrl = window.URL.createObjectURL(file === null || file === void 0 ? void 0 : file.originFileObj);
+              file.preview = objectUrl;
+              // file.preview = await getBase64(file.originFileObj as RcFile);
             }
-            _context3.next = 3;
-            return getBase64(file.originFileObj);
-          case 3:
-            file.preview = _context3.sent;
-          case 4:
-            setPreviewImage(file.url || file.preview);
-            setPreviewVisible(true);
-            setPreviewTitle((((_file$name$indexOf = (_file$name = file.name).indexOf) === null || _file$name$indexOf === void 0 ? void 0 : _file$name$indexOf.call(_file$name, 'data:image')) > -1 ? '' : file.name) || (file.url && ((_file$url$indexOf = (_file$url = file.url).indexOf) === null || _file$url$indexOf === void 0 ? void 0 : _file$url$indexOf.call(_file$url, 'data:image')) > -1 ? '' : file.url.substring(file.url.lastIndexOf('/') + 1)));
-          case 7:
+            if (file.url || file.preview) {
+              // const previewUrl = (file.url || (file.preview as string)) + '&fullfilename='+file.name
+              // console.log(previewUrl);
+              window.open("https://fileview.ipcrystal.com/onlinePreview?url=" + encodeURIComponent(encode(file.url || file.preview)));
+              // window.open("https://fileview.ipcrystal.com/onlinePreview?url=" + encodeURIComponent(file.url || (file.preview as string)))
+            }
+            // setPreviewImage(file.url || (file.preview as string));
+            // setPreviewVisible(true);
+            // setPreviewTitle((file.name.indexOf?.('data:image') > -1 ? '' : file.name) || (file.url && file.url.indexOf?.('data:image') > -1 ? '' : file.url!.substring(file.url!.lastIndexOf('/') + 1)));
+          case 2:
           case "end":
             return _context3.stop();
         }
@@ -2573,25 +2551,7 @@ function Index$1(_ref, ref) {
       }
       return setProgress(Math.floor(percent));
     }
-  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(Modal$2, {
-    open: previewVisible,
-    title: previewTitle,
-    footer: null,
-    onCancel: handleCancel
-  }, type == 'dragger' ? /*#__PURE__*/React.createElement(FileViewer, {
-    fileType: previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '',
-    filePath: previewImage,
-    errorComponent: /*#__PURE__*/React.createElement(React.Fragment, null, "".concat(previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '', " \u7C7B\u578B\u4E0D\u652F\u6301\u9884\u89C8\uFF01")),
-    onError: function onError(err) {
-      console.log(err);
-    }
-  }) : /*#__PURE__*/React.createElement("img", {
-    alt: "example",
-    style: {
-      width: '100%'
-    },
-    src: previewImage
-  })));
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom));
 }
 var Upload = /*#__PURE__*/React.forwardRef(Index$1);
 

package/dist/index.js

@@ -7,7 +7,7 @@ var lodashEs = require('lodash-es');
 var shim = require('use-sync-external-store/shim');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
-var FileViewer = require('react-file-viewer');
+var jsBase64 = require('js-base64');
 var classnames = require('classnames');
 var zhCN = require('antd/es/date-picker/locale/zh_CN');
 var dayjs = require('dayjs');
@@ -54,7 +54,6 @@ function _interopNamespace(e) {
 }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var FileViewer__default = /*#__PURE__*/_interopDefaultLegacy(FileViewer);
 var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
 var zhCN__default = /*#__PURE__*/_interopDefaultLegacy(zhCN);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
@@ -2377,6 +2376,7 @@ WInput.defaultProps = {};
 
 var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
 var Dragger = antd.Upload.Dragger;
+// import FileViewer from 'react-file-viewer';
 function Index$1(_ref, ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
@@ -2416,33 +2416,7 @@ function Index$1(_ref, ref) {
       return file.url;
     }), fileList);
   }, [fileList]);
-  var _useState5 = React.useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    previewVisible = _useState6[0],
-    setPreviewVisible = _useState6[1];
-  var _useState7 = React.useState(''),
-    _useState8 = _slicedToArray(_useState7, 2),
-    previewImage = _useState8[0],
-    setPreviewImage = _useState8[1];
-  var _useState9 = React.useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    previewTitle = _useState10[0],
-    setPreviewTitle = _useState10[1];
-  var getBase64 = function getBase64(file) {
-    return new Promise(function (resolve, reject) {
-      var reader = new FileReader();
-      reader.readAsDataURL(file);
-      reader.onload = function () {
-        return resolve(reader.result);
-      };
-      reader.onerror = function (error) {
-        return reject(error);
-      };
-    });
-  };
-  var handleCancel = function handleCancel() {
-    return setPreviewVisible(false);
-  };
+  // const handleCancel = () => setPreviewVisible(false);
   var beforeUploadIn = function beforeUploadIn(file) {
     var defaultHandler = function defaultHandler(file) {
       var isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
@@ -2487,15 +2461,16 @@ function Index$1(_ref, ref) {
   }();
   var request = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
-      var onSuccess, onError, file, onProgress, url, fileObj;
+      var onSuccess, onError, file, onProgress, objectUrl, url, fileObj;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             onSuccess = options.onSuccess, onError = options.onError, file = options.file, onProgress = options.onProgress;
             _context2.prev = 1;
-            _context2.next = 4;
-            return fetchMethod ? fetchMethod(file) : getBase64(file);
-          case 4:
+            objectUrl = window.URL.createObjectURL(file); // const url = await (fetchMethod ? fetchMethod(file as RcFile) : getBase64(file as RcFile));
+            _context2.next = 5;
+            return fetchMethod ? fetchMethod(file) : objectUrl;
+          case 5:
             url = _context2.sent;
             if (url) {
               fileObj = {
@@ -2510,20 +2485,20 @@ function Index$1(_ref, ref) {
               // setFileList(newFileList);
               onSuccess(url, file);
             }
-            _context2.next = 12;
+            _context2.next = 13;
             break;
-          case 8:
-            _context2.prev = 8;
+          case 9:
+            _context2.prev = 9;
             _context2.t0 = _context2["catch"](1);
             console.log("Eroor: ", _context2.t0);
             onError({
               err: _context2.t0
             });
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[1, 8]]);
+      }, _callee2, null, [[1, 9]]);
     }));
     return function request(_x2) {
       return _ref4.apply(this, arguments);
@@ -2545,23 +2520,25 @@ function Index$1(_ref, ref) {
   };
   var handlePreview = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(file) {
-      var _file$name$indexOf, _file$name, _file$url$indexOf, _file$url;
+      var objectUrl;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            if (!(!file.url && !file.preview)) {
-              _context3.next = 4;
-              break;
+            if (!file.url && !file.preview) {
+              objectUrl = window.URL.createObjectURL(file === null || file === void 0 ? void 0 : file.originFileObj);
+              file.preview = objectUrl;
+              // file.preview = await getBase64(file.originFileObj as RcFile);
             }
-            _context3.next = 3;
-            return getBase64(file.originFileObj);
-          case 3:
-            file.preview = _context3.sent;
-          case 4:
-            setPreviewImage(file.url || file.preview);
-            setPreviewVisible(true);
-            setPreviewTitle((((_file$name$indexOf = (_file$name = file.name).indexOf) === null || _file$name$indexOf === void 0 ? void 0 : _file$name$indexOf.call(_file$name, 'data:image')) > -1 ? '' : file.name) || (file.url && ((_file$url$indexOf = (_file$url = file.url).indexOf) === null || _file$url$indexOf === void 0 ? void 0 : _file$url$indexOf.call(_file$url, 'data:image')) > -1 ? '' : file.url.substring(file.url.lastIndexOf('/') + 1)));
-          case 7:
+            if (file.url || file.preview) {
+              // const previewUrl = (file.url || (file.preview as string)) + '&fullfilename='+file.name
+              // console.log(previewUrl);
+              window.open("https://fileview.ipcrystal.com/onlinePreview?url=" + encodeURIComponent(jsBase64.encode(file.url || file.preview)));
+              // window.open("https://fileview.ipcrystal.com/onlinePreview?url=" + encodeURIComponent(file.url || (file.preview as string)))
+            }
+            // setPreviewImage(file.url || (file.preview as string));
+            // setPreviewVisible(true);
+            // setPreviewTitle((file.name.indexOf?.('data:image') > -1 ? '' : file.name) || (file.url && file.url.indexOf?.('data:image') > -1 ? '' : file.url!.substring(file.url!.lastIndexOf('/') + 1)));
+          case 2:
           case "end":
             return _context3.stop();
         }
@@ -2617,25 +2594,7 @@ function Index$1(_ref, ref) {
       }
       return setProgress(Math.floor(percent));
     }
-  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
-    open: previewVisible,
-    title: previewTitle,
-    footer: null,
-    onCancel: handleCancel
-  }, type == 'dragger' ? /*#__PURE__*/React__default['default'].createElement(FileViewer__default['default'], {
-    fileType: previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '',
-    filePath: previewImage,
-    errorComponent: /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, "".concat(previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '', " \u7C7B\u578B\u4E0D\u652F\u6301\u9884\u89C8\uFF01")),
-    onError: function onError(err) {
-      console.log(err);
-    }
-  }) : /*#__PURE__*/React__default['default'].createElement("img", {
-    alt: "example",
-    style: {
-      width: '100%'
-    },
-    src: previewImage
-  })));
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom));
 }
 var Upload = /*#__PURE__*/React__default['default'].forwardRef(Index$1);
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.7.90",
+  "version": "0.7.91",
   "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
+    "dev": "export NODE_OPTIONS=--openssl-legacy-provider && dumi dev",
+    "docs:build": "export NODE_OPTIONS=--openssl-legacy-provider &&  dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
     "build": "father-build",
     "deploy": "npm run docs:build && npm run docs:deploy",
@@ -48,15 +48,15 @@
   "dependencies": {
     "@ant-design/pro-table": "^3.13.11",
     "animate.css": "^4.1.1",
+    "antd": "5.12.1",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
     "hls.js": "^1.4.12",
+    "js-base64": "^3.7.5",
+    "lodash-es": "4.17.21",
     "react-countup": "^6.0.0",
     "react-dnd": "^16.0.1",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
     "react-dnd-html5-backend": "^16.0.1",
-    "antd": "5.12.1",
-    "lodash-es": "4.17.21",
-    "react-file-viewer": "^1.2.1",
     "swiper": "^6.7.0",
     "use-sync-external-store": "^1.2.0",
     "xgplayer": "^2.31.2",
@@ -68,15 +68,14 @@
     "@ant-design/icons": ">=4.2.0",
     "antd": ">=5.8.0",
     "classnames": ">=2.2.0",
+    "dayjs": ">=^1.11.7",
     "echarts": "^5.2.2",
     "echarts-for-react": "^3.0.2",
     "lodash-es": ">=4.17.21",
-    "react-file-viewer": "^1.2.1",
     "react": ">=^18.0.0",
-    "react-dom": ">=^18.0.0",
-    "dayjs": ">=^1.11.7",
     "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1"
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dom": ">=^18.0.0"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.6.4",
@@ -90,4 +89,4 @@
     "prettier": "^1.19.1",
     "yorkie": "^2.0.0"
   }
-}
+}