@kmkf-fe-packages/basic-components 2.2.5-beta.24 → 2.2.5-beta.27

package/dist/index.esm.js

@@ -7227,7 +7227,7 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
   var _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 20 : _ref$maxCount,
     _ref$maxSize = _ref.maxSize,
-    maxSize = _ref$maxSize === void 0 ? 100 : _ref$maxSize,
+    maxSize = _ref$maxSize === void 0 ? 200 : _ref$maxSize,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? fn$3 : _ref$onChange,
     _ref$value = _ref.value,
@@ -8763,8 +8763,8 @@ var SubForm = function SubForm(props) {
       var _ref2,
         _ref2$pageNo,
         pageNo,
-        _yield$request,
-        templateDetail,
+        _ref2$componentList,
+        componentList,
         params,
         res,
         data,
@@ -8776,25 +8776,13 @@ var SubForm = function SubForm(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$pageNo = _ref2.pageNo, pageNo = _ref2$pageNo === void 0 ? 1 : _ref2$pageNo;
+            _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$pageNo = _ref2.pageNo, pageNo = _ref2$pageNo === void 0 ? 1 : _ref2$pageNo, _ref2$componentList = _ref2.componentList, componentList = _ref2$componentList === void 0 ? [] : _ref2$componentList;
             if (!disabled) {
               _context.next = 3;
               break;
             }
             return _context.abrupt("return");
           case 3:
-            _context.next = 5;
-            return extendRequest('/qy/gdfw/template/queryTemplateDetail', {
-              method: 'post',
-              data: {
-                templateType: 'QY_CUSTOM',
-                uniqueKey: workOrderTemplateId
-              }
-            });
-          case 5:
-            _yield$request = _context.sent;
-            templateDetail = _yield$request.data;
-            setComponentDtoList((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []);
             params = {
               flowNodeId: nodeId,
               flowTemplateKey: flowTemplateKey === null || flowTemplateKey === void 0 ? void 0 : flowTemplateKey[1],
@@ -8820,16 +8808,16 @@ var SubForm = function SubForm(props) {
                 value: [inputValue]
               }];
             }
-            _context.next = 12;
+            _context.next = 7;
             return extendRequest('/qy/view/workOrderList', {
               method: 'post',
               data: params
             });
-          case 12:
+          case 7:
             res = _context.sent;
             data = res.data, success = res.success;
             if (success) {
-              transDataSourceItem = transformWorkOrderData(templateDetail.componentDtoList, 'init');
+              transDataSourceItem = transformWorkOrderData(componentDtoList.length ? componentDtoList : componentList, 'init');
               headerKeys = correlationList.map(function (t) {
                 return t.key;
               });
@@ -8854,7 +8842,7 @@ var SubForm = function SubForm(props) {
               setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
               isRequest.current = false;
             }
-          case 15:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -8864,10 +8852,61 @@ var SubForm = function SubForm(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getTemplateDetail = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _yield$request, templateDetail;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/template/queryTemplateDetail', {
+              method: 'post',
+              data: {
+                templateType: 'QY_CUSTOM',
+                uniqueKey: workOrderTemplateId
+              }
+            });
+          case 2:
+            _yield$request = _context2.sent;
+            templateDetail = _yield$request.data;
+            setComponentDtoList((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []);
+            return _context2.abrupt("return", (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getTemplateDetail() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var initHandle = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var componentList;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return getTemplateDetail();
+          case 2:
+            componentList = _context3.sent;
+            getWorkOrderList({
+              pageNo: 1,
+              componentList: componentList
+            });
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function initHandle() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
-    getWorkOrderList({
-      pageNo: 1
-    });
+    initHandle();
   }, []);
   useUpdateEffect(function () {
     setPageNo(1);
@@ -15609,7 +15648,7 @@ var FilterSelectOption = function FilterSelectOption(props) {
       maxTagCount: "responsive",
       valueMapping: "uniqueKey",
       style: {
-        width: '220px'
+        width: '195px'
       }
     }, props));
   } : componentMap$1[filterComponentType];
@@ -15876,7 +15915,7 @@ var SearchHeader = function SearchHeader(_ref) {
       hidden: !show,
       style: {
         marginRight: '4px',
-        minWidth: '220px'
+        minWidth: '195px'
       },
       key: item.id
     }, /*#__PURE__*/React.createElement(FilterSelectOption, _objectSpread2({

package/dist/index.js

@@ -7240,7 +7240,7 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
   var _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 20 : _ref$maxCount,
     _ref$maxSize = _ref.maxSize,
-    maxSize = _ref$maxSize === void 0 ? 100 : _ref$maxSize,
+    maxSize = _ref$maxSize === void 0 ? 200 : _ref$maxSize,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? fn$3 : _ref$onChange,
     _ref$value = _ref.value,
@@ -8776,8 +8776,8 @@ var SubForm = function SubForm(props) {
       var _ref2,
         _ref2$pageNo,
         pageNo,
-        _yield$request,
-        templateDetail,
+        _ref2$componentList,
+        componentList,
         params,
         res,
         data,
@@ -8789,25 +8789,13 @@ var SubForm = function SubForm(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$pageNo = _ref2.pageNo, pageNo = _ref2$pageNo === void 0 ? 1 : _ref2$pageNo;
+            _ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$pageNo = _ref2.pageNo, pageNo = _ref2$pageNo === void 0 ? 1 : _ref2$pageNo, _ref2$componentList = _ref2.componentList, componentList = _ref2$componentList === void 0 ? [] : _ref2$componentList;
             if (!disabled) {
               _context.next = 3;
               break;
             }
             return _context.abrupt("return");
           case 3:
-            _context.next = 5;
-            return extendRequest('/qy/gdfw/template/queryTemplateDetail', {
-              method: 'post',
-              data: {
-                templateType: 'QY_CUSTOM',
-                uniqueKey: workOrderTemplateId
-              }
-            });
-          case 5:
-            _yield$request = _context.sent;
-            templateDetail = _yield$request.data;
-            setComponentDtoList((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []);
             params = {
               flowNodeId: nodeId,
               flowTemplateKey: flowTemplateKey === null || flowTemplateKey === void 0 ? void 0 : flowTemplateKey[1],
@@ -8833,16 +8821,16 @@ var SubForm = function SubForm(props) {
                 value: [inputValue]
               }];
             }
-            _context.next = 12;
+            _context.next = 7;
             return extendRequest('/qy/view/workOrderList', {
               method: 'post',
               data: params
             });
-          case 12:
+          case 7:
             res = _context.sent;
             data = res.data, success = res.success;
             if (success) {
-              transDataSourceItem = kmkfUtils.transformWorkOrderData(templateDetail.componentDtoList, 'init');
+              transDataSourceItem = kmkfUtils.transformWorkOrderData(componentDtoList.length ? componentDtoList : componentList, 'init');
               headerKeys = correlationList.map(function (t) {
                 return t.key;
               });
@@ -8867,7 +8855,7 @@ var SubForm = function SubForm(props) {
               setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
               isRequest.current = false;
             }
-          case 15:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -8877,10 +8865,61 @@ var SubForm = function SubForm(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getTemplateDetail = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _yield$request, templateDetail;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/template/queryTemplateDetail', {
+              method: 'post',
+              data: {
+                templateType: 'QY_CUSTOM',
+                uniqueKey: workOrderTemplateId
+              }
+            });
+          case 2:
+            _yield$request = _context2.sent;
+            templateDetail = _yield$request.data;
+            setComponentDtoList((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []);
+            return _context2.abrupt("return", (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getTemplateDetail() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var initHandle = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var componentList;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return getTemplateDetail();
+          case 2:
+            componentList = _context3.sent;
+            getWorkOrderList({
+              pageNo: 1,
+              componentList: componentList
+            });
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function initHandle() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   React.useEffect(function () {
-    getWorkOrderList({
-      pageNo: 1
-    });
+    initHandle();
   }, []);
   ahooks.useUpdateEffect(function () {
     setPageNo(1);
@@ -15622,7 +15661,7 @@ var FilterSelectOption = function FilterSelectOption(props) {
       maxTagCount: "responsive",
       valueMapping: "uniqueKey",
       style: {
-        width: '220px'
+        width: '195px'
       }
     }, props));
   } : componentMap$1[filterComponentType];
@@ -15889,7 +15928,7 @@ var SearchHeader = function SearchHeader(_ref) {
       hidden: !show,
       style: {
         marginRight: '4px',
-        minWidth: '220px'
+        minWidth: '195px'
       },
       key: item.id
     }, /*#__PURE__*/React__default['default'].createElement(FilterSelectOption, _objectSpread2({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.5-beta.24",
+  "version": "2.2.5-beta.27",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bfe3e9ec4b6446cda8fa57ebe0cc19369bf7022d"
+  "gitHead": "dec65eaecc7a821bd085fa2a783d364272fb9fe4"
 }