@luck-design-biz/luckda 0.0.15-4 → 0.0.15-6

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 +66 -69
  2. package/es/utils/form.js +0 -1
  3. package/lib/components/LdFormList/index.js +66 -69
  4. package/lib/utils/form.js +0 -1
  5. package/package.json +1 -1
package/es/components/LdFormList/index.js CHANGED
@@ -1,5 +1,3 @@
1
- import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
2
- import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
1
  import _extends from "@babel/runtime/helpers/esm/extends";
4
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
5
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -114,54 +112,53 @@ var LdFormList = function LdFormList(_ref) {
114
112
  suppressDept: false
115
113
  }));
116
114
  };
117
- useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
118
- var _props$ticketData, _params, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
119
- return _regeneratorRuntime().wrap(function _callee$(_context) {
120
- while (1) switch (_context.prev = _context.next) {
121
- case 0:
122
- if (!(formMode !== 'add')) {
123
- _context.next = 8;
124
- break;
125
- }
126
- _params = {
127
- 'indocno': (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
128
- moduleCode: rest.moduleCode,
129
- datasetCode: mainDataSetKey,
130
- mainDataSetKey: mainDataSetKey,
131
- behaviorKey: 'readBpm'
132
- };
133
- _context.next = 4;
134
- return readBehaviorCall(_params);
135
- case 4:
136
- _yield$readBehaviorCa = _context.sent;
137
- code = _yield$readBehaviorCa.code;
138
- data = _yield$readBehaviorCa.data;
139
- if (code == 1 && data) {
140
- bpmInfoObj = data.bpmInfo;
141
- tempObj = {
142
- bizKey: bpmInfoObj.bizKey,
143
- sname: bpmInfoObj.name,
144
- modelKey: bpmInfoObj.bpmKey,
145
- // basekey : bpmInfoObj.buskey,
146
- idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
147
- moduleCode: rest.moduleCode,
148
- datasetCode: mainDataSetKey,
149
- indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
150
- };
151
- setBizData(tempObj);
152
- setIsCustomRenderAffixRight(true);
153
- }
154
- case 8:
155
- case "end":
156
- return _context.stop();
157
- }
158
- }, _callee);
159
- })), []);
115
+
116
+ // useAsyncEffect(async () => {
117
+ // if (formMode !== 'add') {
118
+ // const _params = {
119
+ // indocno: props.ticketData?.indocno,
120
+ // moduleCode: rest.moduleCode,
121
+ // datasetCode: mainDataSetKey,
122
+ // mainDataSetKey: mainDataSetKey,
123
+ // behaviorKey: 'readBpm',
124
+ // };
125
+
126
+ // const _params1 = {
127
+ // indocno: props.ticketData?.indocno,
128
+ // moduleCode: rest.moduleCode,
129
+ // datasetCode: mainDataSetKey,
130
+ // mainDataSetKey: mainDataSetKey,
131
+ // behaviorKey: 'readBpmDeploy',
132
+ // };
133
+ // // 请求是否有工作流服务
134
+ // const response = await readBehaviorCall(_params1);
135
+ // if (response.code === 1 && response.data) {
136
+ // const { code, data } = await readBehaviorCall(_params);
137
+
138
+ // if (code == 1 && data) {
139
+ // const bpmInfoObj = data.bpmInfo;
140
+ // const tempObj = {
141
+ // bizKey: bpmInfoObj.bizKey,
142
+ // sname: bpmInfoObj.name,
143
+ // modelKey: bpmInfoObj.bpmKey,
144
+ // // basekey : bpmInfoObj.buskey,
145
+ // idocid: props.ticketData?.indocno,
146
+ // moduleCode: rest.moduleCode,
147
+ // datasetCode: mainDataSetKey,
148
+ // indocno: props.ticketData?.indocno,
149
+ // };
150
+ // setBizData(tempObj);
151
+ // setIsCustomRenderAffixRight(true);
152
+ // }
153
+ // }
154
+ // }
155
+ // }, []);
156
+
160
157
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
161
- var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
162
- formCode = _ref7.formCode,
163
- formKey = _ref7.formKey,
164
- formUid = _ref7.formUid;
158
+ var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
159
+ formCode = _ref6.formCode,
160
+ formKey = _ref6.formKey,
161
+ formUid = _ref6.formUid;
165
162
  setSubmitLoading(true);
166
163
  onBatchSubmitAction({
167
164
  values: values,
@@ -255,19 +252,19 @@ var LdFormList = function LdFormList(_ref) {
255
252
  layout: affixLayout || defaultLayout
256
253
  }), formList.map(function (formProps) {
257
254
  if (formProps.dataSetKey) {
258
- var _ref8 = formProps || {},
259
- ldId = _ref8.id,
260
- _ref8$header = _ref8.header,
261
- header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
262
- title = _ref8.title,
263
- _readOnly = _ref8.readOnly,
264
- _ref8$extraConfig = _ref8.extraConfig,
265
- extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
266
- _ref8$renderTopLeft = _ref8.renderTopLeft,
267
- _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
255
+ var _ref7 = formProps || {},
256
+ ldId = _ref7.id,
257
+ _ref7$header = _ref7.header,
258
+ header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
259
+ title = _ref7.title,
260
+ _readOnly = _ref7.readOnly,
261
+ _ref7$extraConfig = _ref7.extraConfig,
262
+ extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
263
+ _ref7$renderTopLeft = _ref7.renderTopLeft,
264
+ _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
268
265
  return /*#__PURE__*/React.createElement(React.Fragment, null);
269
- } : _ref8$renderTopLeft,
270
- _props = _objectWithoutProperties(_ref8, _excluded3);
266
+ } : _ref7$renderTopLeft,
267
+ _props = _objectWithoutProperties(_ref7, _excluded3);
271
268
  var _props$type = _props.type,
272
269
  type = _props$type === void 0 ? 'auto' : _props$type;
273
270
  var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -327,9 +324,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
327
324
  formMode: 'add'
328
325
  }, initData)
329
326
  });
330
- return connect(function (_ref9) {
331
- var modelName = _ref9[namespace],
332
- loading = _ref9.loading;
327
+ return connect(function (_ref8) {
328
+ var modelName = _ref8[namespace],
329
+ loading = _ref8.loading;
333
330
  return {
334
331
  formData: modelName.formData,
335
332
  formOperates: modelName.formOperates,
@@ -340,11 +337,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
340
337
  };
341
338
  })(WrappedComponent);
342
339
  };
343
- var Index = function Index(_ref10) {
344
- var namespace = _ref10.ldId,
345
- initData = _ref10.initData,
346
- overModel = _ref10.overModel,
347
- props = _objectWithoutProperties(_ref10, _excluded4);
340
+ var Index = function Index(_ref9) {
341
+ var namespace = _ref9.ldId,
342
+ initData = _ref9.initData,
343
+ overModel = _ref9.overModel,
344
+ props = _objectWithoutProperties(_ref9, _excluded4);
348
345
  var match = useRouteMatch();
349
346
  var Component = useCreation(function () {
350
347
  var _getDvaApp3, _getDvaApp4, _match$params;
package/es/utils/form.js CHANGED
@@ -103,7 +103,6 @@ export var formItemDataFormat = function formItemDataFormat() {
103
103
  break;
104
104
  case 'upload':
105
105
  result[name] = values[name];
106
- result["".concat(name, "_virtual")] = values["".concat(name, "_virtual")];
107
106
  break;
108
107
  default:
109
108
  if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
package/lib/components/LdFormList/index.js CHANGED
@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.default = void 0;
9
- var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
10
- var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
9
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
12
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
11
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -121,54 +119,53 @@ var LdFormList = function LdFormList(_ref) {
121
119
  suppressDept: false
122
120
  }));
123
121
  };
124
- (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
125
- var _props$ticketData, _params, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
126
- return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
127
- while (1) switch (_context.prev = _context.next) {
128
- case 0:
129
- if (!(formMode !== 'add')) {
130
- _context.next = 8;
131
- break;
132
- }
133
- _params = {
134
- 'indocno': (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
135
- moduleCode: rest.moduleCode,
136
- datasetCode: mainDataSetKey,
137
- mainDataSetKey: mainDataSetKey,
138
- behaviorKey: 'readBpm'
139
- };
140
- _context.next = 4;
141
- return (0, _services.readBehaviorCall)(_params);
142
- case 4:
143
- _yield$readBehaviorCa = _context.sent;
144
- code = _yield$readBehaviorCa.code;
145
- data = _yield$readBehaviorCa.data;
146
- if (code == 1 && data) {
147
- bpmInfoObj = data.bpmInfo;
148
- tempObj = {
149
- bizKey: bpmInfoObj.bizKey,
150
- sname: bpmInfoObj.name,
151
- modelKey: bpmInfoObj.bpmKey,
152
- // basekey : bpmInfoObj.buskey,
153
- idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
154
- moduleCode: rest.moduleCode,
155
- datasetCode: mainDataSetKey,
156
- indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
157
- };
158
- setBizData(tempObj);
159
- setIsCustomRenderAffixRight(true);
160
- }
161
- case 8:
162
- case "end":
163
- return _context.stop();
164
- }
165
- }, _callee);
166
- })), []);
122
+
123
+ // useAsyncEffect(async () => {
124
+ // if (formMode !== 'add') {
125
+ // const _params = {
126
+ // indocno: props.ticketData?.indocno,
127
+ // moduleCode: rest.moduleCode,
128
+ // datasetCode: mainDataSetKey,
129
+ // mainDataSetKey: mainDataSetKey,
130
+ // behaviorKey: 'readBpm',
131
+ // };
132
+
133
+ // const _params1 = {
134
+ // indocno: props.ticketData?.indocno,
135
+ // moduleCode: rest.moduleCode,
136
+ // datasetCode: mainDataSetKey,
137
+ // mainDataSetKey: mainDataSetKey,
138
+ // behaviorKey: 'readBpmDeploy',
139
+ // };
140
+ // // 请求是否有工作流服务
141
+ // const response = await readBehaviorCall(_params1);
142
+ // if (response.code === 1 && response.data) {
143
+ // const { code, data } = await readBehaviorCall(_params);
144
+
145
+ // if (code == 1 && data) {
146
+ // const bpmInfoObj = data.bpmInfo;
147
+ // const tempObj = {
148
+ // bizKey: bpmInfoObj.bizKey,
149
+ // sname: bpmInfoObj.name,
150
+ // modelKey: bpmInfoObj.bpmKey,
151
+ // // basekey : bpmInfoObj.buskey,
152
+ // idocid: props.ticketData?.indocno,
153
+ // moduleCode: rest.moduleCode,
154
+ // datasetCode: mainDataSetKey,
155
+ // indocno: props.ticketData?.indocno,
156
+ // };
157
+ // setBizData(tempObj);
158
+ // setIsCustomRenderAffixRight(true);
159
+ // }
160
+ // }
161
+ // }
162
+ // }, []);
163
+
167
164
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
168
- var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
169
- formCode = _ref7.formCode,
170
- formKey = _ref7.formKey,
171
- formUid = _ref7.formUid;
165
+ var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
166
+ formCode = _ref6.formCode,
167
+ formKey = _ref6.formKey,
168
+ formUid = _ref6.formUid;
172
169
  setSubmitLoading(true);
173
170
  (0, _action.onBatchSubmitAction)({
174
171
  values: values,
@@ -262,19 +259,19 @@ var LdFormList = function LdFormList(_ref) {
262
259
  layout: affixLayout || defaultLayout
263
260
  }), formList.map(function (formProps) {
264
261
  if (formProps.dataSetKey) {
265
- var _ref8 = formProps || {},
266
- ldId = _ref8.id,
267
- _ref8$header = _ref8.header,
268
- header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
269
- title = _ref8.title,
270
- _readOnly = _ref8.readOnly,
271
- _ref8$extraConfig = _ref8.extraConfig,
272
- extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
273
- _ref8$renderTopLeft = _ref8.renderTopLeft,
274
- _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
262
+ var _ref7 = formProps || {},
263
+ ldId = _ref7.id,
264
+ _ref7$header = _ref7.header,
265
+ header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
266
+ title = _ref7.title,
267
+ _readOnly = _ref7.readOnly,
268
+ _ref7$extraConfig = _ref7.extraConfig,
269
+ extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
270
+ _ref7$renderTopLeft = _ref7.renderTopLeft,
271
+ _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
275
272
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
276
- } : _ref8$renderTopLeft,
277
- _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
273
+ } : _ref7$renderTopLeft,
274
+ _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded3);
278
275
  var _props$type = _props.type,
279
276
  type = _props$type === void 0 ? 'auto' : _props$type;
280
277
  var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -334,9 +331,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
334
331
  formMode: 'add'
335
332
  }, initData)
336
333
  });
337
- return (0, _umi.connect)(function (_ref9) {
338
- var modelName = _ref9[namespace],
339
- loading = _ref9.loading;
334
+ return (0, _umi.connect)(function (_ref8) {
335
+ var modelName = _ref8[namespace],
336
+ loading = _ref8.loading;
340
337
  return {
341
338
  formData: modelName.formData,
342
339
  formOperates: modelName.formOperates,
@@ -347,11 +344,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
347
344
  };
348
345
  })(WrappedComponent);
349
346
  };
350
- var Index = function Index(_ref10) {
351
- var namespace = _ref10.ldId,
352
- initData = _ref10.initData,
353
- overModel = _ref10.overModel,
354
- props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
347
+ var Index = function Index(_ref9) {
348
+ var namespace = _ref9.ldId,
349
+ initData = _ref9.initData,
350
+ overModel = _ref9.overModel,
351
+ props = (0, _objectWithoutProperties2.default)(_ref9, _excluded4);
355
352
  var match = (0, _umi.useRouteMatch)();
356
353
  var Component = (0, _ahooks.useCreation)(function () {
357
354
  var _getDvaApp3, _getDvaApp4, _match$params;
package/lib/utils/form.js CHANGED
@@ -111,7 +111,6 @@ var formItemDataFormat = function formItemDataFormat() {
111
111
  break;
112
112
  case 'upload':
113
113
  result[name] = values[name];
114
- result["".concat(name, "_virtual")] = values["".concat(name, "_virtual")];
115
114
  break;
116
115
  default:
117
116
  if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.15-4",
3
+ "version": "0.0.15-6",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",