@luck-design-biz/luckda 0.0.15-5 → 0.0.15-7

package/es/components/LdFormList/index.js

@@ -1,5 +1,3 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -114,69 +112,53 @@ var LdFormList = function LdFormList(_ref) {
       suppressDept: false
     }));
   };
-  useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$ticketData, _props$ticketData2, _params, _params1, response, _yield$readBehaviorCa, code, data, _props$ticketData3, _props$ticketData4, bpmInfoObj, tempObj;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (!(formMode !== 'add')) {
-            _context.next = 13;
-            break;
-          }
-          _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
-            behaviorKey: 'readBpm'
-          };
-          _params1 = {
-            indocno: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
-            behaviorKey: 'readBpmDeploy'
-          }; // 请求是否有工作流服务
-          _context.next = 5;
-          return readBehaviorCall(_params1);
-        case 5:
-          response = _context.sent;
-          if (!(response.code === 1 && response.data)) {
-            _context.next = 13;
-            break;
-          }
-          _context.next = 9;
-          return readBehaviorCall(_params);
-        case 9:
-          _yield$readBehaviorCa = _context.sent;
-          code = _yield$readBehaviorCa.code;
-          data = _yield$readBehaviorCa.data;
-          if (code == 1 && data) {
-            bpmInfoObj = data.bpmInfo;
-            tempObj = {
-              bizKey: bpmInfoObj.bizKey,
-              sname: bpmInfoObj.name,
-              modelKey: bpmInfoObj.bpmKey,
-              // basekey :  bpmInfoObj.buskey,
-              idocid: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno,
-              moduleCode: rest.moduleCode,
-              datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData4 = props.ticketData) === null || _props$ticketData4 === void 0 ? void 0 : _props$ticketData4.indocno
-            };
-            setBizData(tempObj);
-            setIsCustomRenderAffixRight(true);
-          }
-        case 13:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), []);
+
+  //   useAsyncEffect(async () => {
+  //     if (formMode !== 'add') {
+  //       const _params = {
+  //         indocno: props.ticketData?.indocno,
+  //         moduleCode: rest.moduleCode,
+  //         datasetCode: mainDataSetKey,
+  //         mainDataSetKey: mainDataSetKey,
+  //         behaviorKey: 'readBpm',
+  //       };
+
+  //       const _params1 = {
+  //         indocno: props.ticketData?.indocno,
+  //         moduleCode: rest.moduleCode,
+  //         datasetCode: mainDataSetKey,
+  //         mainDataSetKey: mainDataSetKey,
+  //         behaviorKey: 'readBpmDeploy',
+  //       };
+  //       // 请求是否有工作流服务
+  //       const response = await readBehaviorCall(_params1);
+  //       if (response.code === 1 && response.data) {
+  //         const { code, data } = await readBehaviorCall(_params);
+
+  //         if (code == 1 && data) {
+  //           const bpmInfoObj = data.bpmInfo;
+  //           const tempObj = {
+  //             bizKey: bpmInfoObj.bizKey,
+  //             sname: bpmInfoObj.name,
+  //             modelKey: bpmInfoObj.bpmKey,
+  //             // basekey :  bpmInfoObj.buskey,
+  //             idocid: props.ticketData?.indocno,
+  //             moduleCode: rest.moduleCode,
+  //             datasetCode: mainDataSetKey,
+  //             indocno: props.ticketData?.indocno,
+  //           };
+  //           setBizData(tempObj);
+  //           setIsCustomRenderAffixRight(true);
+  //         }
+  //       }
+  //     }
+  //   }, []);
+
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
-    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      formCode = _ref7.formCode,
-      formKey = _ref7.formKey,
-      formUid = _ref7.formUid;
+    var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref6.formCode,
+      formKey = _ref6.formKey,
+      formUid = _ref6.formUid;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -270,19 +252,19 @@ var LdFormList = function LdFormList(_ref) {
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
     if (formProps.dataSetKey) {
-      var _ref8 = formProps || {},
-        ldId = _ref8.id,
-        _ref8$header = _ref8.header,
-        header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
-        title = _ref8.title,
-        _readOnly = _ref8.readOnly,
-        _ref8$extraConfig = _ref8.extraConfig,
-        extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
-        _ref8$renderTopLeft = _ref8.renderTopLeft,
-        _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
+      var _ref7 = formProps || {},
+        ldId = _ref7.id,
+        _ref7$header = _ref7.header,
+        header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
+        title = _ref7.title,
+        _readOnly = _ref7.readOnly,
+        _ref7$extraConfig = _ref7.extraConfig,
+        extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
+        _ref7$renderTopLeft = _ref7.renderTopLeft,
+        _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
-        } : _ref8$renderTopLeft,
-        _props = _objectWithoutProperties(_ref8, _excluded3);
+        } : _ref7$renderTopLeft,
+        _props = _objectWithoutProperties(_ref7, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -342,9 +324,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return connect(function (_ref9) {
-    var modelName = _ref9[namespace],
-      loading = _ref9.loading;
+  return connect(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -355,11 +337,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref10) {
-  var namespace = _ref10.ldId,
-    initData = _ref10.initData,
-    overModel = _ref10.overModel,
-    props = _objectWithoutProperties(_ref10, _excluded4);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = _objectWithoutProperties(_ref9, _excluded4);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/es/utils/form.js

@@ -103,6 +103,7 @@ export var formItemDataFormat = function formItemDataFormat() {
         break;
       case 'upload':
         result[name] = values[name];
+        result["".concat(name, "_virtual")] = values["".concat(name, "_virtual")];
         break;
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];

package/lib/components/LdFormList/index.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -121,69 +119,53 @@ var LdFormList = function LdFormList(_ref) {
       suppressDept: false
     }));
   };
-  (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$ticketData, _props$ticketData2, _params, _params1, response, _yield$readBehaviorCa, code, data, _props$ticketData3, _props$ticketData4, bpmInfoObj, tempObj;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (!(formMode !== 'add')) {
-            _context.next = 13;
-            break;
-          }
-          _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
-            behaviorKey: 'readBpm'
-          };
-          _params1 = {
-            indocno: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
-            behaviorKey: 'readBpmDeploy'
-          }; // 请求是否有工作流服务
-          _context.next = 5;
-          return (0, _services.readBehaviorCall)(_params1);
-        case 5:
-          response = _context.sent;
-          if (!(response.code === 1 && response.data)) {
-            _context.next = 13;
-            break;
-          }
-          _context.next = 9;
-          return (0, _services.readBehaviorCall)(_params);
-        case 9:
-          _yield$readBehaviorCa = _context.sent;
-          code = _yield$readBehaviorCa.code;
-          data = _yield$readBehaviorCa.data;
-          if (code == 1 && data) {
-            bpmInfoObj = data.bpmInfo;
-            tempObj = {
-              bizKey: bpmInfoObj.bizKey,
-              sname: bpmInfoObj.name,
-              modelKey: bpmInfoObj.bpmKey,
-              // basekey :  bpmInfoObj.buskey,
-              idocid: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno,
-              moduleCode: rest.moduleCode,
-              datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData4 = props.ticketData) === null || _props$ticketData4 === void 0 ? void 0 : _props$ticketData4.indocno
-            };
-            setBizData(tempObj);
-            setIsCustomRenderAffixRight(true);
-          }
-        case 13:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), []);
+
+  //   useAsyncEffect(async () => {
+  //     if (formMode !== 'add') {
+  //       const _params = {
+  //         indocno: props.ticketData?.indocno,
+  //         moduleCode: rest.moduleCode,
+  //         datasetCode: mainDataSetKey,
+  //         mainDataSetKey: mainDataSetKey,
+  //         behaviorKey: 'readBpm',
+  //       };
+
+  //       const _params1 = {
+  //         indocno: props.ticketData?.indocno,
+  //         moduleCode: rest.moduleCode,
+  //         datasetCode: mainDataSetKey,
+  //         mainDataSetKey: mainDataSetKey,
+  //         behaviorKey: 'readBpmDeploy',
+  //       };
+  //       // 请求是否有工作流服务
+  //       const response = await readBehaviorCall(_params1);
+  //       if (response.code === 1 && response.data) {
+  //         const { code, data } = await readBehaviorCall(_params);
+
+  //         if (code == 1 && data) {
+  //           const bpmInfoObj = data.bpmInfo;
+  //           const tempObj = {
+  //             bizKey: bpmInfoObj.bizKey,
+  //             sname: bpmInfoObj.name,
+  //             modelKey: bpmInfoObj.bpmKey,
+  //             // basekey :  bpmInfoObj.buskey,
+  //             idocid: props.ticketData?.indocno,
+  //             moduleCode: rest.moduleCode,
+  //             datasetCode: mainDataSetKey,
+  //             indocno: props.ticketData?.indocno,
+  //           };
+  //           setBizData(tempObj);
+  //           setIsCustomRenderAffixRight(true);
+  //         }
+  //       }
+  //     }
+  //   }, []);
+
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
-    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      formCode = _ref7.formCode,
-      formKey = _ref7.formKey,
-      formUid = _ref7.formUid;
+    var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref6.formCode,
+      formKey = _ref6.formKey,
+      formUid = _ref6.formUid;
     setSubmitLoading(true);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -277,19 +259,19 @@ var LdFormList = function LdFormList(_ref) {
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
     if (formProps.dataSetKey) {
-      var _ref8 = formProps || {},
-        ldId = _ref8.id,
-        _ref8$header = _ref8.header,
-        header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
-        title = _ref8.title,
-        _readOnly = _ref8.readOnly,
-        _ref8$extraConfig = _ref8.extraConfig,
-        extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
-        _ref8$renderTopLeft = _ref8.renderTopLeft,
-        _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
+      var _ref7 = formProps || {},
+        ldId = _ref7.id,
+        _ref7$header = _ref7.header,
+        header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
+        title = _ref7.title,
+        _readOnly = _ref7.readOnly,
+        _ref7$extraConfig = _ref7.extraConfig,
+        extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
+        _ref7$renderTopLeft = _ref7.renderTopLeft,
+        _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-        } : _ref8$renderTopLeft,
-        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
+        } : _ref7$renderTopLeft,
+        _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -349,9 +331,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return (0, _umi.connect)(function (_ref9) {
-    var modelName = _ref9[namespace],
-      loading = _ref9.loading;
+  return (0, _umi.connect)(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -362,11 +344,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref10) {
-  var namespace = _ref10.ldId,
-    initData = _ref10.initData,
-    overModel = _ref10.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = (0, _objectWithoutProperties2.default)(_ref9, _excluded4);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/lib/utils/form.js

@@ -111,6 +111,7 @@ var formItemDataFormat = function formItemDataFormat() {
         break;
       case 'upload':
         result[name] = values[name];
+        result["".concat(name, "_virtual")] = values["".concat(name, "_virtual")];
         break;
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.15-5",
+  "version": "0.0.15-7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",