ds-web-all 1.0.1-beta.90 → 1.0.1-beta.92

package/lib/components/button/upload.js

@@ -15,7 +15,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _fileRequest = _interopRequireDefault(require("../../common/fileRequest"));
 require("./index.less");
 var _Confirm = _interopRequireDefault(require("../Confirm"));
-var _excluded = ["onFinish", "listType", "multiple", "accept", "value", "text", "buttonProps", "requestUrl", "confirmProps", "onError"];
+var _excluded = ["onFinish", "listType", "multiple", "accept", "value", "text", "buttonProps", "requestUrl", "confirmProps", "onError", "requestTimeout", "defaultErrorMsg"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -49,6 +49,10 @@ var BaseUpload = function BaseUpload(_ref) {
     requestUrl = _ref.requestUrl,
     confirmProps = _ref.confirmProps,
     onError = _ref.onError,
+    _ref$requestTimeout = _ref.requestTimeout,
+    requestTimeout = _ref$requestTimeout === void 0 ? 30000 : _ref$requestTimeout,
+    _ref$defaultErrorMsg = _ref.defaultErrorMsg,
+    defaultErrorMsg = _ref$defaultErrorMsg === void 0 ? '上传失败' : _ref$defaultErrorMsg,
     props = _objectWithoutProperties(_ref, _excluded);
   var headers = {
     Authorization: window.token
@@ -114,7 +118,8 @@ var BaseUpload = function BaseUpload(_ref) {
               headers: {
                 'Content-Type': 'multipart/form-data'
               },
-              data: formData
+              data: formData,
+              timeout: requestTimeout
             });
           case 6:
             res = _context.sent;
@@ -124,7 +129,7 @@ var BaseUpload = function BaseUpload(_ref) {
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](3);
-            errorMessage = (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.message) || (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '上传失败';
+            errorMessage = (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.message) || (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || defaultErrorMsg;
             _message2.default.error(errorMessage);
             onError === null || onError === void 0 ? void 0 : onError(_context.t0);
             console.error('Upload error:', _context.t0);

package/lib/components/compose-manage/index.js

@@ -98,10 +98,7 @@ var ComposeManage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     emptyText = _ref$emptyText === void 0 ? '暂无数据' : _ref$emptyText,
     _ref$staticDataSource = _ref.staticDataSource,
     staticDataSource = _ref$staticDataSource === void 0 ? [] : _ref$staticDataSource,
-    _ref$staticFilter = _ref.staticFilter,
-    staticFilter = _ref$staticFilter === void 0 ? function () {
-      return true;
-    } : _ref$staticFilter,
+    staticFilter = _ref.staticFilter,
     _ref$staticSearch = _ref.staticSearch,
     staticSearch = _ref$staticSearch === void 0 ? function () {} : _ref$staticSearch,
     _ref$outerLoading = _ref.outerLoading,
@@ -421,6 +418,13 @@ var ComposeManage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }
     formRef.current.resetFields(); // 重置搜索框中表单
     formRef.current.setFieldsValue(initialFilterValues);
+    if (!dataRequest && typeof staticFilter === 'function') {
+      var newData = staticDataSourceCache.current.filter(function (el, i) {
+        return staticFilter(initialFilterValues, el, i);
+      });
+      setTableSource(_toConsumableArray(newData));
+      setTotal(newData.length);
+    }
     if (!dataRequest && typeof staticSearch === 'function') {
       staticSearch(initialFilterValues);
     }
@@ -633,15 +637,23 @@ var ComposeManage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       newTotal = _ref6.total,
       newPageNo = _ref6.pageNo,
       newPageSize = _ref6.pageSize;
-    setTableSource(dataSorce);
-    setTotal(newTotal !== null && newTotal !== void 0 ? newTotal : dataSorce.length);
+    staticDataSourceCache.current = dataSorce;
+    if (!dataRequest && typeof staticFilter === 'function') {
+      var newData = staticDataSourceCache.current.filter(function (el, i) {
+        return staticFilter(search, el, i);
+      });
+      setTableSource(_toConsumableArray(newData));
+      setTotal(newTotal !== null && newTotal !== void 0 ? newTotal : newData.length);
+    } else {
+      setTableSource(dataSorce);
+      setTotal(newTotal !== null && newTotal !== void 0 ? newTotal : dataSorce.length);
+    }
     if (typeof newPageNo === 'number') {
       setPageNo(newPageNo);
     }
     if (typeof newPageSize === 'number') {
       setPageSize(newPageSize);
     }
-    staticDataSourceCache.current = dataSorce;
   };
   var scrollTableRefCb = function scrollTableRefCb(ref) {
     if (scrollTableRef.current) {

package/lib/components/table/index.js

@@ -474,19 +474,21 @@ function CFTable(_ref2) {
     return JSON.stringify(simpleColumns);
   }, [simpleColumns]);
   (0, _react.useEffect)(function () {
-    columnWidthMapRef.current = columnWidthMap;
-    var sum = rowSelectWidth;
-    var _loopForEach = function loopForEach(arr) {
-      arr.forEach(function (col) {
-        if (col.children && col.children.length > 0) {
-          _loopForEach(col.children);
-        } else {
-          sum += columnWidthMap[col.name] || 0;
-        }
-      });
-    };
-    _loopForEach(columns);
-    setResizeScrollX(sum);
+    if (resizeable) {
+      columnWidthMapRef.current = columnWidthMap;
+      var sum = rowSelectWidth;
+      var _loopForEach = function loopForEach(arr) {
+        arr.forEach(function (col) {
+          if (col.children && col.children.length > 0) {
+            _loopForEach(col.children);
+          } else {
+            sum += columnWidthMap[col.name] || 0;
+          }
+        });
+      };
+      _loopForEach(columns);
+      setResizeScrollX(sum);
+    }
   }, [columnWidthMap, rowSelectWidth]);
   (0, _react.useEffect)(function () {
     columnConfigWidthMapOld.current = _objectSpread({}, columnConfigWidthMap.current);

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "ds-web-all",
-  "version": "1.0.1-beta.90",
+  "version": "1.0.1-beta.92",
   "scripts": {
     "start": "cross-env BUILD_ENV=dev && dumi dev",
     "docs:build": "cross-env BUILD_ENV=production && dumi build",