@luck-design-biz/luckda 0.0.18 → 0.0.19

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 (3) hide show
  1. package/es/components/LdFormList/index.js +62 -22
  2. package/lib/components/LdFormList/index.js +61 -21
  3. package/package.json +1 -1
package/es/components/LdFormList/index.js CHANGED
@@ -8,10 +8,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
8
8
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
9
9
  var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
10
10
  _excluded2 = ["dataSets", "doAction", "resources"],
11
- _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
12
- _excluded4 = ["ldId", "initData", "overModel"];
11
+ _excluded3 = ["formMode"],
12
+ _excluded4 = ["formMode"],
13
+ _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
14
+ _excluded6 = ["ldId", "initData", "overModel"];
13
15
  import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
14
- import { connect, getDvaApp, useRouteMatch } from 'umi';
16
+ import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
15
17
  import PropTypes from 'prop-types';
16
18
  import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
17
19
  import { BasicDivider } from 'luck-design';
@@ -27,6 +29,7 @@ import { onBatchSubmitAction } from '../../helper/action';
27
29
  import { isArray, sortBy, mapValues } from 'lodash';
28
30
  import { BpmButton } from '@luck-design-biz/base/bpm';
29
31
  import { readBehaviorCall } from '../../services';
32
+ import { parse, stringify } from 'querystring';
30
33
 
31
34
  // 组件
32
35
  var LdFormList = function LdFormList(_ref) {
@@ -56,6 +59,15 @@ var LdFormList = function LdFormList(_ref) {
56
59
  _ref$bpmButtonProps = _ref.bpmButtonProps,
57
60
  bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
58
61
  props = _objectWithoutProperties(_ref, _excluded);
62
+ var _useModel = useModel('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
63
+ return {
64
+ peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
65
+ refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
66
+ };
67
+ }),
68
+ peek = _useModel.peek,
69
+ refresh = _useModel.refresh;
70
+ var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
59
71
  var _useState = useState(false),
60
72
  _useState2 = _slicedToArray(_useState, 2),
61
73
  submitLoading = _useState2[0],
@@ -118,35 +130,34 @@ var LdFormList = function LdFormList(_ref) {
118
130
  }, bpmButtonProps)));
119
131
  };
120
132
  useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
121
- var _props$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
133
+ var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
122
134
  return _regeneratorRuntime().wrap(function _callee$(_context) {
123
135
  while (1) switch (_context.prev = _context.next) {
124
136
  case 0:
125
- if (!(formMode !== 'add')) {
126
- _context.next = 13;
137
+ if (!(formMode !== 'add' && props.formData[mainFormLdId])) {
138
+ _context.next = 12;
127
139
  break;
128
140
  }
129
- PRIMARY = window.appConfig.constraintKeys.PRIMARY;
130
141
  _params = {
131
- indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
142
+ indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
132
143
  moduleCode: rest.moduleCode,
133
144
  datasetCode: mainDataSetKey,
134
145
  mainDataSetKey: mainDataSetKey,
135
146
  behaviorKey: 'readBpmDeploy'
136
147
  }; // 请求是否有工作流服务
137
- _context.next = 5;
148
+ _context.next = 4;
138
149
  return readBehaviorCall(_params);
139
- case 5:
150
+ case 4:
140
151
  response = _context.sent;
141
152
  if (!(response.code === 1 && response.data)) {
142
- _context.next = 13;
153
+ _context.next = 12;
143
154
  break;
144
155
  }
145
- _context.next = 9;
156
+ _context.next = 8;
146
157
  return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
147
158
  behaviorKey: 'readBpm'
148
159
  }));
149
- case 9:
160
+ case 8:
150
161
  _yield$readBehaviorCa = _context.sent;
151
162
  code = _yield$readBehaviorCa.code;
152
163
  data = _yield$readBehaviorCa.data;
@@ -156,20 +167,20 @@ var LdFormList = function LdFormList(_ref) {
156
167
  bizKey: bpmInfoObj.bizKey,
157
168
  sname: bpmInfoObj.name,
158
169
  modelKey: bpmInfoObj.bpmKey,
159
- idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
170
+ idocid: (_props$formData$mainF2 = props.formData[mainFormLdId]) === null || _props$formData$mainF2 === void 0 ? void 0 : _props$formData$mainF2[PRIMARY],
160
171
  moduleCode: rest.moduleCode,
161
172
  datasetCode: mainDataSetKey,
162
- indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
173
+ indocno: (_props$formData$mainF3 = props.formData[mainFormLdId]) === null || _props$formData$mainF3 === void 0 ? void 0 : _props$formData$mainF3[PRIMARY]
163
174
  });
164
175
  setBizData(tempObj);
165
176
  setIsCustomRenderAffixRight(true);
166
177
  }
167
- case 13:
178
+ case 12:
168
179
  case "end":
169
180
  return _context.stop();
170
181
  }
171
182
  }, _callee);
172
- })), [props.formData]);
183
+ })), [props.formData, formMode]);
173
184
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
174
185
  var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
175
186
  formCode = _ref7.formCode,
@@ -190,16 +201,45 @@ var LdFormList = function LdFormList(_ref) {
190
201
  mainDataSetKey: mainDataSetKey
191
202
  }, function (success, mainKey, res) {
192
203
  setSubmitLoading(false);
204
+ var mainFormData = res.detail[res.list[0]];
193
205
  if (success) {
194
206
  if (afterSubmit) {
195
207
  afterSubmit(success, mainKey, res);
208
+ // 刷新浮层，解决新增后，操作日志获取不到uid的问题
209
+ if (refresh && peek) {
210
+ var _peek = peek(),
211
+ href = _peek.href;
212
+ var _href$split = href.split('?'),
213
+ _href$split2 = _slicedToArray(_href$split, 2),
214
+ path = _href$split2[0],
215
+ argsStr = _href$split2[1];
216
+ var _parse = parse(argsStr),
217
+ _formMode = _parse.formMode,
218
+ _props2 = _objectWithoutProperties(_parse, _excluded3);
219
+ refresh({
220
+ href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props2)))
221
+ });
222
+ }
196
223
  } else {
197
224
  var _formListRef$current;
198
- formListRef.current.setFormMode('info');
199
225
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
200
- var mainFormData = res.detail[res.list[0]];
201
226
  formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
202
- return formListRef.current.setFormMode('info');
227
+ formListRef.current.setFormMode('info');
228
+ // 刷新浮层，解决新增后，操作日志获取不到uid的问题
229
+ if (refresh && peek) {
230
+ var _peek2 = peek(),
231
+ _href = _peek2.href;
232
+ var _href$split3 = _href.split('?'),
233
+ _href$split4 = _slicedToArray(_href$split3, 2),
234
+ _path = _href$split4[0],
235
+ _argsStr = _href$split4[1];
236
+ var _parse2 = parse(_argsStr),
237
+ _formMode2 = _parse2.formMode,
238
+ _props3 = _objectWithoutProperties(_parse2, _excluded4);
239
+ refresh({
240
+ href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props3)))
241
+ });
242
+ }
203
243
  });
204
244
  }
205
245
  }
@@ -266,7 +306,7 @@ var LdFormList = function LdFormList(_ref) {
266
306
  _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
267
307
  return /*#__PURE__*/React.createElement(React.Fragment, null);
268
308
  } : _ref8$renderTopLeft,
269
- _props = _objectWithoutProperties(_ref8, _excluded3);
309
+ _props = _objectWithoutProperties(_ref8, _excluded5);
270
310
  var _props$type = _props.type,
271
311
  type = _props$type === void 0 ? 'auto' : _props$type;
272
312
  var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -343,7 +383,7 @@ var Index = function Index(_ref10) {
343
383
  var namespace = _ref10.ldId,
344
384
  initData = _ref10.initData,
345
385
  overModel = _ref10.overModel,
346
- props = _objectWithoutProperties(_ref10, _excluded4);
386
+ props = _objectWithoutProperties(_ref10, _excluded6);
347
387
  var match = useRouteMatch();
348
388
  var Component = useCreation(function () {
349
389
  var _getDvaApp3, _getDvaApp4, _match$params;
package/lib/components/LdFormList/index.js CHANGED
@@ -31,10 +31,13 @@ var _action = require("../../helper/action");
31
31
  var _lodash = require("lodash");
32
32
  var _bpm = require("@luck-design-biz/base/bpm");
33
33
  var _services = require("../../services");
34
+ var _querystring = require("querystring");
34
35
  var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
35
36
  _excluded2 = ["dataSets", "doAction", "resources"],
36
- _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
37
- _excluded4 = ["ldId", "initData", "overModel"];
37
+ _excluded3 = ["formMode"],
38
+ _excluded4 = ["formMode"],
39
+ _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
40
+ _excluded6 = ["ldId", "initData", "overModel"];
38
41
  // 组件
39
42
  var LdFormList = function LdFormList(_ref) {
40
43
  var _formList$find;
@@ -63,6 +66,15 @@ var LdFormList = function LdFormList(_ref) {
63
66
  _ref$bpmButtonProps = _ref.bpmButtonProps,
64
67
  bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
65
68
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
69
+ var _useModel = (0, _umi.useModel)('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
70
+ return {
71
+ peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
72
+ refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
73
+ };
74
+ }),
75
+ peek = _useModel.peek,
76
+ refresh = _useModel.refresh;
77
+ var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
66
78
  var _useState = (0, _react.useState)(false),
67
79
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
68
80
  submitLoading = _useState2[0],
@@ -125,35 +137,34 @@ var LdFormList = function LdFormList(_ref) {
125
137
  }, bpmButtonProps)));
126
138
  };
127
139
  (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
128
- var _props$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
140
+ var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
129
141
  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
130
142
  while (1) switch (_context.prev = _context.next) {
131
143
  case 0:
132
- if (!(formMode !== 'add')) {
133
- _context.next = 13;
144
+ if (!(formMode !== 'add' && props.formData[mainFormLdId])) {
145
+ _context.next = 12;
134
146
  break;
135
147
  }
136
- PRIMARY = window.appConfig.constraintKeys.PRIMARY;
137
148
  _params = {
138
- indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
149
+ indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
139
150
  moduleCode: rest.moduleCode,
140
151
  datasetCode: mainDataSetKey,
141
152
  mainDataSetKey: mainDataSetKey,
142
153
  behaviorKey: 'readBpmDeploy'
143
154
  }; // 请求是否有工作流服务
144
- _context.next = 5;
155
+ _context.next = 4;
145
156
  return (0, _services.readBehaviorCall)(_params);
146
- case 5:
157
+ case 4:
147
158
  response = _context.sent;
148
159
  if (!(response.code === 1 && response.data)) {
149
- _context.next = 13;
160
+ _context.next = 12;
150
161
  break;
151
162
  }
152
- _context.next = 9;
163
+ _context.next = 8;
153
164
  return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
154
165
  behaviorKey: 'readBpm'
155
166
  }));
156
- case 9:
167
+ case 8:
157
168
  _yield$readBehaviorCa = _context.sent;
158
169
  code = _yield$readBehaviorCa.code;
159
170
  data = _yield$readBehaviorCa.data;
@@ -163,20 +174,20 @@ var LdFormList = function LdFormList(_ref) {
163
174
  bizKey: bpmInfoObj.bizKey,
164
175
  sname: bpmInfoObj.name,
165
176
  modelKey: bpmInfoObj.bpmKey,
166
- idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
177
+ idocid: (_props$formData$mainF2 = props.formData[mainFormLdId]) === null || _props$formData$mainF2 === void 0 ? void 0 : _props$formData$mainF2[PRIMARY],
167
178
  moduleCode: rest.moduleCode,
168
179
  datasetCode: mainDataSetKey,
169
- indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
180
+ indocno: (_props$formData$mainF3 = props.formData[mainFormLdId]) === null || _props$formData$mainF3 === void 0 ? void 0 : _props$formData$mainF3[PRIMARY]
170
181
  });
171
182
  setBizData(tempObj);
172
183
  setIsCustomRenderAffixRight(true);
173
184
  }
174
- case 13:
185
+ case 12:
175
186
  case "end":
176
187
  return _context.stop();
177
188
  }
178
189
  }, _callee);
179
- })), [props.formData]);
190
+ })), [props.formData, formMode]);
180
191
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
181
192
  var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
182
193
  formCode = _ref7.formCode,
@@ -197,16 +208,45 @@ var LdFormList = function LdFormList(_ref) {
197
208
  mainDataSetKey: mainDataSetKey
198
209
  }, function (success, mainKey, res) {
199
210
  setSubmitLoading(false);
211
+ var mainFormData = res.detail[res.list[0]];
200
212
  if (success) {
201
213
  if (afterSubmit) {
202
214
  afterSubmit(success, mainKey, res);
215
+ // 刷新浮层，解决新增后，操作日志获取不到uid的问题
216
+ if (refresh && peek) {
217
+ var _peek = peek(),
218
+ href = _peek.href;
219
+ var _href$split = href.split('?'),
220
+ _href$split2 = (0, _slicedToArray2.default)(_href$split, 2),
221
+ path = _href$split2[0],
222
+ argsStr = _href$split2[1];
223
+ var _parse = (0, _querystring.parse)(argsStr),
224
+ _formMode = _parse.formMode,
225
+ _props2 = (0, _objectWithoutProperties2.default)(_parse, _excluded3);
226
+ refresh({
227
+ href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props2)))
228
+ });
229
+ }
203
230
  } else {
204
231
  var _formListRef$current;
205
- formListRef.current.setFormMode('info');
206
232
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
207
- var mainFormData = res.detail[res.list[0]];
208
233
  formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
209
- return formListRef.current.setFormMode('info');
234
+ formListRef.current.setFormMode('info');
235
+ // 刷新浮层，解决新增后，操作日志获取不到uid的问题
236
+ if (refresh && peek) {
237
+ var _peek2 = peek(),
238
+ _href = _peek2.href;
239
+ var _href$split3 = _href.split('?'),
240
+ _href$split4 = (0, _slicedToArray2.default)(_href$split3, 2),
241
+ _path = _href$split4[0],
242
+ _argsStr = _href$split4[1];
243
+ var _parse2 = (0, _querystring.parse)(_argsStr),
244
+ _formMode2 = _parse2.formMode,
245
+ _props3 = (0, _objectWithoutProperties2.default)(_parse2, _excluded4);
246
+ refresh({
247
+ href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props3)))
248
+ });
249
+ }
210
250
  });
211
251
  }
212
252
  }
@@ -273,7 +313,7 @@ var LdFormList = function LdFormList(_ref) {
273
313
  _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
274
314
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
275
315
  } : _ref8$renderTopLeft,
276
- _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
316
+ _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded5);
277
317
  var _props$type = _props.type,
278
318
  type = _props$type === void 0 ? 'auto' : _props$type;
279
319
  var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -350,7 +390,7 @@ var Index = function Index(_ref10) {
350
390
  var namespace = _ref10.ldId,
351
391
  initData = _ref10.initData,
352
392
  overModel = _ref10.overModel,
353
- props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
393
+ props = (0, _objectWithoutProperties2.default)(_ref10, _excluded6);
354
394
  var match = (0, _umi.useRouteMatch)();
355
395
  var Component = (0, _ahooks.useCreation)(function () {
356
396
  var _getDvaApp3, _getDvaApp4, _match$params;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.18",
3
+ "version": "0.0.19",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",