@luck-design-biz/luckda 0.0.7 → 0.0.8-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/components/LdFormList/index.js +35 -27
  2. package/es/helper/action.js +22 -20
  3. package/lib/components/LdFormList/index.js +35 -27
  4. package/lib/helper/action.js +22 -20
  5. package/package.json +1 -1
package/es/components/LdFormList/index.js CHANGED
@@ -63,17 +63,16 @@ var LdFormList = function LdFormList(_ref) {
63
63
  useImperativeHandle(wrapperRef, function () {
64
64
  return _objectSpread(_objectSpread({}, formListRef.current), {}, {
65
65
  onLdQuery: function onLdQuery() {
66
+ var _getDvaApp;
66
67
  var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
67
- if (props.formMode !== 'add') {
68
- var _getDvaApp;
69
- (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
70
- type: "".concat(namespace, "/setTicketData"),
71
- payload: {
72
- ticketData: _objectSpread(_objectSpread({}, props.ticketData), _params)
73
- }
74
- });
75
- formListRef.current.doQuery();
76
- }
68
+ (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
69
+ type: "".concat(namespace, "/setTicketData"),
70
+ payload: {
71
+ ticketData: _objectSpread(_objectSpread({}, props.ticketData), _params)
72
+ }
73
+ }).then(function () {
74
+ formListRef.current.doQuery(null, _objectSpread(_objectSpread({}, props.ticketData), _params));
75
+ });
77
76
  }
78
77
  });
79
78
  });
@@ -114,33 +113,42 @@ var LdFormList = function LdFormList(_ref) {
114
113
  formData: props.formData,
115
114
  form_id: formKey,
116
115
  effcode: formCode
117
- }, function (success, indocno) {
116
+ }, function (success, indocno, res) {
118
117
  setSubmitLoading(false);
119
118
  if (success) {
120
119
  if (afterSubmit) {
121
- afterSubmit();
120
+ afterSubmit(success, indocno, res);
122
121
  } else {
123
122
  var _formListRef$current;
124
123
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
125
- if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
126
- var _history$location = history.location,
127
- pathname = _history$location.pathname,
128
- query = _history$location.query;
129
- var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
130
- window.openUrl("layer:".concat(_pathname).concat(stringify(_objectSpread(_objectSpread({}, query), {}, {
131
- title: window.__INJECTED_APP_NAME_BY_QIANKUN__
132
- }))));
133
- } else {
134
- formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
135
- indocno: indocno
136
- }), function () {
137
- return formListRef.current.setFormMode('edit');
138
- });
139
- }
124
+ // if (
125
+ // !formWindow &&
126
+ // formMode === 'add' &&
127
+ // window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
128
+ // ) {
129
+ // const { pathname, query } = history.location;
130
+ // const _pathname = pathname.replace(
131
+ // /\/0(?=[?]|[\/]$|$)/g,
132
+ // `/${indocno}?`,
133
+ // );
134
+ // window.openUrl(
135
+ // `layer:${_pathname}${stringify({
136
+ // ...query,
137
+ // title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
138
+ // })}`,
139
+ // );
140
+ // } else {
141
+ formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
142
+ indocno: indocno
143
+ }), function () {
144
+ return formListRef.current.setFormMode('edit');
145
+ });
146
+ // }
140
147
  }
141
148
  }
142
149
  });
143
150
  };
151
+
144
152
  var formConfig = _objectSpread(_objectSpread({
145
153
  formState: formState,
146
154
  formMode: formMode,
package/es/helper/action.js CHANGED
@@ -20,6 +20,8 @@ export var doAction = function doAction(action) {
20
20
  _ref$showConfirm = _ref.showConfirm,
21
21
  showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
22
22
  callback = _ref.callback,
23
+ _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
24
+ showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
23
25
  form_id = _ref.form_id,
24
26
  effcode = _ref.effcode;
25
27
  var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
@@ -49,11 +51,11 @@ export var doAction = function doAction(action) {
49
51
  moduleCode: moduleCode,
50
52
  form_id: form_id,
51
53
  effcode: effcode
52
- }, data).then(function (_ref3) {
53
- var code = _ref3.code,
54
- data = _ref3.data;
55
- callback && callback(code === 1, data);
56
- if (code === 1) {
54
+ }, data).then(function (res) {
55
+ var code = res.code,
56
+ data = res.data;
57
+ callback && callback(code === 1, data, res);
58
+ if (code === 1 && showPopWhenSuccess) {
57
59
  showPop(formatMessage({
58
60
  id: 'app.base.tip.operate.success'
59
61
  }), null, 'success');
@@ -68,23 +70,23 @@ export var doAction = function doAction(action) {
68
70
  }));
69
71
  }
70
72
  };
71
- export var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
72
- var values = _ref4.values,
73
- _ref4$formList = _ref4.formList,
74
- formList = _ref4$formList === void 0 ? [] : _ref4$formList,
75
- _ref4$dataSets = _ref4.dataSets,
76
- dataSets = _ref4$dataSets === void 0 ? {} : _ref4$dataSets,
77
- _ref4$beforeSubmit = _ref4.beforeSubmit,
78
- beforeSubmit = _ref4$beforeSubmit === void 0 ? function (values) {
73
+ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
74
+ var values = _ref3.values,
75
+ _ref3$formList = _ref3.formList,
76
+ formList = _ref3$formList === void 0 ? [] : _ref3$formList,
77
+ _ref3$dataSets = _ref3.dataSets,
78
+ dataSets = _ref3$dataSets === void 0 ? {} : _ref3$dataSets,
79
+ _ref3$beforeSubmit = _ref3.beforeSubmit,
80
+ beforeSubmit = _ref3$beforeSubmit === void 0 ? function (values) {
79
81
  return new Promise(function (resolve) {
80
82
  return resolve(values);
81
83
  });
82
- } : _ref4$beforeSubmit,
83
- doAction = _ref4.doAction,
84
- action = _ref4.action,
85
- formData = _ref4.formData,
86
- form_id = _ref4.form_id,
87
- effcode = _ref4.effcode;
84
+ } : _ref3$beforeSubmit,
85
+ doAction = _ref3.doAction,
86
+ action = _ref3.action,
87
+ formData = _ref3.formData,
88
+ form_id = _ref3.form_id,
89
+ effcode = _ref3.effcode;
88
90
  var data = transform(formList, function (result, value) {
89
91
  var _formData$value$id, _values$value$id;
90
92
  if (values[value.id]) {
@@ -123,7 +125,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
123
125
  }
124
126
  }
125
127
  }, {});
126
- beforeSubmit(data).then(function (backData) {
128
+ beforeSubmit(data, values).then(function (backData) {
127
129
  if (backData) {
128
130
  doAction(action, backData, {
129
131
  showConfirm: false,
package/lib/components/LdFormList/index.js CHANGED
@@ -70,17 +70,16 @@ var LdFormList = function LdFormList(_ref) {
70
70
  (0, _react.useImperativeHandle)(wrapperRef, function () {
71
71
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
72
72
  onLdQuery: function onLdQuery() {
73
+ var _getDvaApp;
73
74
  var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
74
- if (props.formMode !== 'add') {
75
- var _getDvaApp;
76
- (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
77
- type: "".concat(namespace, "/setTicketData"),
78
- payload: {
79
- ticketData: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params)
80
- }
81
- });
82
- formListRef.current.doQuery();
83
- }
75
+ (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
76
+ type: "".concat(namespace, "/setTicketData"),
77
+ payload: {
78
+ ticketData: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params)
79
+ }
80
+ }).then(function () {
81
+ formListRef.current.doQuery(null, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params));
82
+ });
84
83
  }
85
84
  });
86
85
  });
@@ -121,33 +120,42 @@ var LdFormList = function LdFormList(_ref) {
121
120
  formData: props.formData,
122
121
  form_id: formKey,
123
122
  effcode: formCode
124
- }, function (success, indocno) {
123
+ }, function (success, indocno, res) {
125
124
  setSubmitLoading(false);
126
125
  if (success) {
127
126
  if (afterSubmit) {
128
- afterSubmit();
127
+ afterSubmit(success, indocno, res);
129
128
  } else {
130
129
  var _formListRef$current;
131
130
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
132
- if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
133
- var _history$location = _umi.history.location,
134
- pathname = _history$location.pathname,
135
- query = _history$location.query;
136
- var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
137
- window.openUrl("layer:".concat(_pathname).concat((0, _querystring.stringify)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, query), {}, {
138
- title: window.__INJECTED_APP_NAME_BY_QIANKUN__
139
- }))));
140
- } else {
141
- formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
142
- indocno: indocno
143
- }), function () {
144
- return formListRef.current.setFormMode('edit');
145
- });
146
- }
131
+ // if (
132
+ // !formWindow &&
133
+ // formMode === 'add' &&
134
+ // window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
135
+ // ) {
136
+ // const { pathname, query } = history.location;
137
+ // const _pathname = pathname.replace(
138
+ // /\/0(?=[?]|[\/]$|$)/g,
139
+ // `/${indocno}?`,
140
+ // );
141
+ // window.openUrl(
142
+ // `layer:${_pathname}${stringify({
143
+ // ...query,
144
+ // title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
145
+ // })}`,
146
+ // );
147
+ // } else {
148
+ formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
149
+ indocno: indocno
150
+ }), function () {
151
+ return formListRef.current.setFormMode('edit');
152
+ });
153
+ // }
147
154
  }
148
155
  }
149
156
  });
150
157
  };
158
+
151
159
  var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
152
160
  formState: formState,
153
161
  formMode: formMode,
package/lib/helper/action.js CHANGED
@@ -27,6 +27,8 @@ var doAction = function doAction(action) {
27
27
  _ref$showConfirm = _ref.showConfirm,
28
28
  showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
29
29
  callback = _ref.callback,
30
+ _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
31
+ showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
30
32
  form_id = _ref.form_id,
31
33
  effcode = _ref.effcode;
32
34
  var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
@@ -56,11 +58,11 @@ var doAction = function doAction(action) {
56
58
  moduleCode: moduleCode,
57
59
  form_id: form_id,
58
60
  effcode: effcode
59
- }, data).then(function (_ref3) {
60
- var code = _ref3.code,
61
- data = _ref3.data;
62
- callback && callback(code === 1, data);
63
- if (code === 1) {
61
+ }, data).then(function (res) {
62
+ var code = res.code,
63
+ data = res.data;
64
+ callback && callback(code === 1, data, res);
65
+ if (code === 1 && showPopWhenSuccess) {
64
66
  (0, _utils.showPop)((0, _utils.formatMessage)({
65
67
  id: 'app.base.tip.operate.success'
66
68
  }), null, 'success');
@@ -76,23 +78,23 @@ var doAction = function doAction(action) {
76
78
  }
77
79
  };
78
80
  exports.doAction = doAction;
79
- var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
80
- var values = _ref4.values,
81
- _ref4$formList = _ref4.formList,
82
- formList = _ref4$formList === void 0 ? [] : _ref4$formList,
83
- _ref4$dataSets = _ref4.dataSets,
84
- dataSets = _ref4$dataSets === void 0 ? {} : _ref4$dataSets,
85
- _ref4$beforeSubmit = _ref4.beforeSubmit,
86
- beforeSubmit = _ref4$beforeSubmit === void 0 ? function (values) {
81
+ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
82
+ var values = _ref3.values,
83
+ _ref3$formList = _ref3.formList,
84
+ formList = _ref3$formList === void 0 ? [] : _ref3$formList,
85
+ _ref3$dataSets = _ref3.dataSets,
86
+ dataSets = _ref3$dataSets === void 0 ? {} : _ref3$dataSets,
87
+ _ref3$beforeSubmit = _ref3.beforeSubmit,
88
+ beforeSubmit = _ref3$beforeSubmit === void 0 ? function (values) {
87
89
  return new Promise(function (resolve) {
88
90
  return resolve(values);
89
91
  });
90
- } : _ref4$beforeSubmit,
91
- doAction = _ref4.doAction,
92
- action = _ref4.action,
93
- formData = _ref4.formData,
94
- form_id = _ref4.form_id,
95
- effcode = _ref4.effcode;
92
+ } : _ref3$beforeSubmit,
93
+ doAction = _ref3.doAction,
94
+ action = _ref3.action,
95
+ formData = _ref3.formData,
96
+ form_id = _ref3.form_id,
97
+ effcode = _ref3.effcode;
96
98
  var data = (0, _lodash.transform)(formList, function (result, value) {
97
99
  var _formData$value$id, _values$value$id;
98
100
  if (values[value.id]) {
@@ -131,7 +133,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
131
133
  }
132
134
  }
133
135
  }, {});
134
- beforeSubmit(data).then(function (backData) {
136
+ beforeSubmit(data, values).then(function (backData) {
135
137
  if (backData) {
136
138
  doAction(action, backData, {
137
139
  showConfirm: false,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.7",
3
+ "version": "0.0.8-1",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",