@luck-design-biz/luckda 0.0.3 → 0.0.4

package/es/components/LdFormList/index.js

@@ -96,7 +96,9 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
-  var handleBatchSubmit = function handleBatchSubmit(values, action) {
+  var handleBatchSubmit = function handleBatchSubmit(values, action, _ref6) {
+    var formCode = _ref6.formCode,
+      formKey = _ref6.formKey;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -105,7 +107,9 @@ var LdFormList = function LdFormList(_ref) {
       beforeSubmit: beforeSubmit,
       doAction: doAction,
       action: action,
-      formData: props.formData
+      formData: props.formData,
+      form_id: formKey,
+      effcode: formCode
     }, function (success, indocno) {
       setSubmitLoading(false);
       if (success) {
@@ -146,11 +150,11 @@ var LdFormList = function LdFormList(_ref) {
   }, props, {
     modelName: namespace,
     ref: formListRef,
-    onAdd: function onAdd(values) {
-      return handleBatchSubmit(values, 'add');
+    onAdd: function onAdd(values, other) {
+      return handleBatchSubmit(values, 'add', other);
     },
-    onBatchUpdate: function onBatchUpdate(values) {
-      return handleBatchSubmit(values, 'update');
+    onBatchUpdate: function onBatchUpdate(values, other) {
+      return handleBatchSubmit(values, 'update', other);
     }
   }), /*#__PURE__*/React.createElement(FormListAffix, {
     showSaveBtn: !readOnly && showSaveBtn,
@@ -159,15 +163,15 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    var _ref6 = formProps || {},
-      ldId = _ref6.id,
-      _ref6$header = _ref6.header,
-      header = _ref6$header === void 0 ? 'collapse' : _ref6$header,
-      title = _ref6.title,
-      _readOnly = _ref6.readOnly,
-      _ref6$extraConfig = _ref6.extraConfig,
-      extraConfig = _ref6$extraConfig === void 0 ? {} : _ref6$extraConfig,
-      _props = _objectWithoutProperties(_ref6, _excluded2);
+    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,
+      _props = _objectWithoutProperties(_ref7, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -219,9 +223,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return connect(function (_ref7) {
-    var modelName = _ref7[namespace],
-      loading = _ref7.loading;
+  return connect(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -232,11 +236,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref8) {
-  var namespace = _ref8.ldId,
-    initData = _ref8.initData,
-    overModel = _ref8.overModel,
-    props = _objectWithoutProperties(_ref8, _excluded3);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = _objectWithoutProperties(_ref9, _excluded3);
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4;
     (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.unmodel(namespace);

package/es/helper/action.js

@@ -19,7 +19,9 @@ export var doAction = function doAction(action) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     _ref$showConfirm = _ref.showConfirm,
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
-    callback = _ref.callback;
+    callback = _ref.callback,
+    form_id = _ref.form_id,
+    effcode = _ref.effcode;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -44,7 +46,9 @@ export var doAction = function doAction(action) {
     var handleAction = function handleAction() {
       behaviorCall({
         behaviorKey: action,
-        moduleCode: moduleCode
+        moduleCode: moduleCode,
+        form_id: form_id,
+        effcode: effcode
       }, data).then(function (_ref3) {
         var code = _ref3.code,
           data = _ref3.data;
@@ -78,7 +82,9 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
     } : _ref4$beforeSubmit,
     doAction = _ref4.doAction,
     action = _ref4.action,
-    formData = _ref4.formData;
+    formData = _ref4.formData,
+    form_id = _ref4.form_id,
+    effcode = _ref4.effcode;
   var data = transform(formList, function (result, value) {
     var _formData$value$id, _values$value$id;
     if (values[value.id]) {
@@ -121,7 +127,9 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
     if (backData) {
       doAction(action, backData, {
         showConfirm: false,
-        callback: callback
+        callback: callback,
+        form_id: form_id,
+        effcode: effcode
       });
     }
   });

package/lib/components/LdFormList/index.js

@@ -103,7 +103,9 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
-  var handleBatchSubmit = function handleBatchSubmit(values, action) {
+  var handleBatchSubmit = function handleBatchSubmit(values, action, _ref6) {
+    var formCode = _ref6.formCode,
+      formKey = _ref6.formKey;
     setSubmitLoading(true);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -112,7 +114,9 @@ var LdFormList = function LdFormList(_ref) {
       beforeSubmit: beforeSubmit,
       doAction: doAction,
       action: action,
-      formData: props.formData
+      formData: props.formData,
+      form_id: formKey,
+      effcode: formCode
     }, function (success, indocno) {
       setSubmitLoading(false);
       if (success) {
@@ -153,11 +157,11 @@ var LdFormList = function LdFormList(_ref) {
   }, props, {
     modelName: namespace,
     ref: formListRef,
-    onAdd: function onAdd(values) {
-      return handleBatchSubmit(values, 'add');
+    onAdd: function onAdd(values, other) {
+      return handleBatchSubmit(values, 'add', other);
     },
-    onBatchUpdate: function onBatchUpdate(values) {
-      return handleBatchSubmit(values, 'update');
+    onBatchUpdate: function onBatchUpdate(values, other) {
+      return handleBatchSubmit(values, 'update', other);
     }
   }), /*#__PURE__*/_react.default.createElement(_FormList.FormListAffix, {
     showSaveBtn: !readOnly && showSaveBtn,
@@ -166,15 +170,15 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    var _ref6 = formProps || {},
-      ldId = _ref6.id,
-      _ref6$header = _ref6.header,
-      header = _ref6$header === void 0 ? 'collapse' : _ref6$header,
-      title = _ref6.title,
-      _readOnly = _ref6.readOnly,
-      _ref6$extraConfig = _ref6.extraConfig,
-      extraConfig = _ref6$extraConfig === void 0 ? {} : _ref6$extraConfig,
-      _props = (0, _objectWithoutProperties2.default)(_ref6, _excluded2);
+    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,
+      _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -226,9 +230,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return (0, _umi.connect)(function (_ref7) {
-    var modelName = _ref7[namespace],
-      loading = _ref7.loading;
+  return (0, _umi.connect)(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -239,11 +243,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref8) {
-  var namespace = _ref8.ldId,
-    initData = _ref8.initData,
-    overModel = _ref8.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = (0, _objectWithoutProperties2.default)(_ref9, _excluded3);
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4;
     (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.unmodel(namespace);

package/lib/helper/action.js

@@ -26,7 +26,9 @@ var doAction = function doAction(action) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     _ref$showConfirm = _ref.showConfirm,
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
-    callback = _ref.callback;
+    callback = _ref.callback,
+    form_id = _ref.form_id,
+    effcode = _ref.effcode;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -51,7 +53,9 @@ var doAction = function doAction(action) {
     var handleAction = function handleAction() {
       (0, _utils2.behaviorCall)({
         behaviorKey: action,
-        moduleCode: moduleCode
+        moduleCode: moduleCode,
+        form_id: form_id,
+        effcode: effcode
       }, data).then(function (_ref3) {
         var code = _ref3.code,
           data = _ref3.data;
@@ -86,7 +90,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
     } : _ref4$beforeSubmit,
     doAction = _ref4.doAction,
     action = _ref4.action,
-    formData = _ref4.formData;
+    formData = _ref4.formData,
+    form_id = _ref4.form_id,
+    effcode = _ref4.effcode;
   var data = (0, _lodash.transform)(formList, function (result, value) {
     var _formData$value$id, _values$value$id;
     if (values[value.id]) {
@@ -129,7 +135,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
     if (backData) {
       doAction(action, backData, {
         showConfirm: false,
-        callback: callback
+        callback: callback,
+        form_id: form_id,
+        effcode: effcode
       });
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@luck-design-biz/base": "^0.0.1",
+    "@luck-design-biz/base": "^0.0.5",
     "@province-city-china/level": "^8.5.4",
     "ahooks": "^3.7.0",
     "antd": "^3.26.6",