@luck-design-biz/luckda 0.0.15-1 → 0.0.15-2

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 +33 -37
  2. package/lib/components/LdFormList/index.js +33 -37
  3. package/package.json +1 -1
package/es/components/LdFormList/index.js CHANGED
@@ -6,7 +6,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
6
6
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
7
7
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
8
8
  var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
9
- _excluded2 = ["readFieldProps", "dataSets", "doAction", "resources"],
9
+ _excluded2 = ["dataSets", "doAction", "resources"],
10
10
  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
11
11
  _excluded4 = ["ldId", "initData", "overModel"];
12
12
  import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
@@ -67,14 +67,11 @@ var LdFormList = function LdFormList(_ref) {
67
67
  setBizData = _useState6[1];
68
68
  var _ref2 = useContext(LuckDaPopContext) || {},
69
69
  defaultLayout = _ref2.affixLayout;
70
- var _ref3 = useContext(FormWindowContext) || {},
71
- formWindow = _ref3.formWindow;
72
- var _ref4 = useContext(LuckDaContext) || {},
73
- readFieldProps = _ref4.readFieldProps,
74
- dataSets = _ref4.dataSets,
75
- doAction = _ref4.doAction,
76
- resources = _ref4.resources,
77
- rest = _objectWithoutProperties(_ref4, _excluded2);
70
+ var _ref3 = useContext(LuckDaContext) || {},
71
+ dataSets = _ref3.dataSets,
72
+ doAction = _ref3.doAction,
73
+ resources = _ref3.resources,
74
+ rest = _objectWithoutProperties(_ref3, _excluded2);
78
75
  var formListRef = useRef(null);
79
76
  useImperativeHandle(wrapperRef, function () {
80
77
  return _objectSpread(_objectSpread({}, formListRef.current), {}, {
@@ -94,8 +91,8 @@ var LdFormList = function LdFormList(_ref) {
94
91
  });
95
92
  });
96
93
  var handleValueChange = useMemoizedFn(function (change) {
97
- var _ref5 = formListRef.current || {},
98
- formRefs = _ref5.formRefs;
94
+ var _ref4 = formListRef.current || {},
95
+ formRefs = _ref4.formRefs;
99
96
  var data = formRefs && Object.keys(formRefs).map(function (key) {
100
97
  var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
101
98
  var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.current) ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
@@ -112,7 +109,6 @@ var LdFormList = function LdFormList(_ref) {
112
109
 
113
110
  /**zss添加**/
114
111
  var renderAffixRightCustom = function renderAffixRightCustom() {
115
- console.log('renderAffixRightCustom');
116
112
  return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, {
117
113
  bizData: bizData,
118
114
  suppressDept: false
@@ -128,7 +124,7 @@ var LdFormList = function LdFormList(_ref) {
128
124
  break;
129
125
  }
130
126
  _params = {
131
- indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
127
+ 'indocno': (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
132
128
  moduleCode: rest.moduleCode,
133
129
  datasetCode: mainDataSetKey,
134
130
  mainDataSetKey: mainDataSetKey,
@@ -162,10 +158,10 @@ var LdFormList = function LdFormList(_ref) {
162
158
  }, _callee);
163
159
  })), []);
164
160
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
165
- var _ref8 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
166
- formCode = _ref8.formCode,
167
- formKey = _ref8.formKey,
168
- formUid = _ref8.formUid;
161
+ var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
162
+ formCode = _ref7.formCode,
163
+ formKey = _ref7.formKey,
164
+ formUid = _ref7.formUid;
169
165
  setSubmitLoading(true);
170
166
  onBatchSubmitAction({
171
167
  values: values,
@@ -259,19 +255,19 @@ var LdFormList = function LdFormList(_ref) {
259
255
  layout: affixLayout || defaultLayout
260
256
  }), formList.map(function (formProps) {
261
257
  if (formProps.dataSetKey) {
262
- var _ref9 = formProps || {},
263
- ldId = _ref9.id,
264
- _ref9$header = _ref9.header,
265
- header = _ref9$header === void 0 ? 'collapse' : _ref9$header,
266
- title = _ref9.title,
267
- _readOnly = _ref9.readOnly,
268
- _ref9$extraConfig = _ref9.extraConfig,
269
- extraConfig = _ref9$extraConfig === void 0 ? {} : _ref9$extraConfig,
270
- _ref9$renderTopLeft = _ref9.renderTopLeft,
271
- _renderTopLeft = _ref9$renderTopLeft === void 0 ? function () {
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 () {
272
268
  return /*#__PURE__*/React.createElement(React.Fragment, null);
273
- } : _ref9$renderTopLeft,
274
- _props = _objectWithoutProperties(_ref9, _excluded3);
269
+ } : _ref8$renderTopLeft,
270
+ _props = _objectWithoutProperties(_ref8, _excluded3);
275
271
  var _props$type = _props.type,
276
272
  type = _props$type === void 0 ? 'auto' : _props$type;
277
273
  var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -331,9 +327,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
331
327
  formMode: 'add'
332
328
  }, initData)
333
329
  });
334
- return connect(function (_ref10) {
335
- var modelName = _ref10[namespace],
336
- loading = _ref10.loading;
330
+ return connect(function (_ref9) {
331
+ var modelName = _ref9[namespace],
332
+ loading = _ref9.loading;
337
333
  return {
338
334
  formData: modelName.formData,
339
335
  formOperates: modelName.formOperates,
@@ -344,11 +340,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
344
340
  };
345
341
  })(WrappedComponent);
346
342
  };
347
- var Index = function Index(_ref11) {
348
- var namespace = _ref11.ldId,
349
- initData = _ref11.initData,
350
- overModel = _ref11.overModel,
351
- props = _objectWithoutProperties(_ref11, _excluded4);
343
+ var Index = function Index(_ref10) {
344
+ var namespace = _ref10.ldId,
345
+ initData = _ref10.initData,
346
+ overModel = _ref10.overModel,
347
+ props = _objectWithoutProperties(_ref10, _excluded4);
352
348
  var match = useRouteMatch();
353
349
  var Component = useCreation(function () {
354
350
  var _getDvaApp3, _getDvaApp4, _match$params;
package/lib/components/LdFormList/index.js CHANGED
@@ -31,7 +31,7 @@ var _lodash = require("lodash");
31
31
  var _bpm = require("@luck-design-biz/base/bpm");
32
32
  var _services = require("../../services");
33
33
  var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
34
- _excluded2 = ["readFieldProps", "dataSets", "doAction", "resources"],
34
+ _excluded2 = ["dataSets", "doAction", "resources"],
35
35
  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
36
36
  _excluded4 = ["ldId", "initData", "overModel"];
37
37
  // 组件
@@ -74,14 +74,11 @@ var LdFormList = function LdFormList(_ref) {
74
74
  setBizData = _useState6[1];
75
75
  var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
76
76
  defaultLayout = _ref2.affixLayout;
77
- var _ref3 = (0, _react.useContext)(FormWindowContext) || {},
78
- formWindow = _ref3.formWindow;
79
- var _ref4 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
80
- readFieldProps = _ref4.readFieldProps,
81
- dataSets = _ref4.dataSets,
82
- doAction = _ref4.doAction,
83
- resources = _ref4.resources,
84
- rest = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
77
+ var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
78
+ dataSets = _ref3.dataSets,
79
+ doAction = _ref3.doAction,
80
+ resources = _ref3.resources,
81
+ rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
85
82
  var formListRef = (0, _react.useRef)(null);
86
83
  (0, _react.useImperativeHandle)(wrapperRef, function () {
87
84
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -101,8 +98,8 @@ var LdFormList = function LdFormList(_ref) {
101
98
  });
102
99
  });
103
100
  var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
104
- var _ref5 = formListRef.current || {},
105
- formRefs = _ref5.formRefs;
101
+ var _ref4 = formListRef.current || {},
102
+ formRefs = _ref4.formRefs;
106
103
  var data = formRefs && Object.keys(formRefs).map(function (key) {
107
104
  var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
108
105
  var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.current) ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
@@ -119,7 +116,6 @@ var LdFormList = function LdFormList(_ref) {
119
116
 
120
117
  /**zss添加**/
121
118
  var renderAffixRightCustom = function renderAffixRightCustom() {
122
- console.log('renderAffixRightCustom');
123
119
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, {
124
120
  bizData: bizData,
125
121
  suppressDept: false
@@ -135,7 +131,7 @@ var LdFormList = function LdFormList(_ref) {
135
131
  break;
136
132
  }
137
133
  _params = {
138
- indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
134
+ 'indocno': (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
139
135
  moduleCode: rest.moduleCode,
140
136
  datasetCode: mainDataSetKey,
141
137
  mainDataSetKey: mainDataSetKey,
@@ -169,10 +165,10 @@ var LdFormList = function LdFormList(_ref) {
169
165
  }, _callee);
170
166
  })), []);
171
167
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
172
- var _ref8 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
173
- formCode = _ref8.formCode,
174
- formKey = _ref8.formKey,
175
- formUid = _ref8.formUid;
168
+ var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
169
+ formCode = _ref7.formCode,
170
+ formKey = _ref7.formKey,
171
+ formUid = _ref7.formUid;
176
172
  setSubmitLoading(true);
177
173
  (0, _action.onBatchSubmitAction)({
178
174
  values: values,
@@ -266,19 +262,19 @@ var LdFormList = function LdFormList(_ref) {
266
262
  layout: affixLayout || defaultLayout
267
263
  }), formList.map(function (formProps) {
268
264
  if (formProps.dataSetKey) {
269
- var _ref9 = formProps || {},
270
- ldId = _ref9.id,
271
- _ref9$header = _ref9.header,
272
- header = _ref9$header === void 0 ? 'collapse' : _ref9$header,
273
- title = _ref9.title,
274
- _readOnly = _ref9.readOnly,
275
- _ref9$extraConfig = _ref9.extraConfig,
276
- extraConfig = _ref9$extraConfig === void 0 ? {} : _ref9$extraConfig,
277
- _ref9$renderTopLeft = _ref9.renderTopLeft,
278
- _renderTopLeft = _ref9$renderTopLeft === void 0 ? function () {
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 () {
279
275
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
280
- } : _ref9$renderTopLeft,
281
- _props = (0, _objectWithoutProperties2.default)(_ref9, _excluded3);
276
+ } : _ref8$renderTopLeft,
277
+ _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
282
278
  var _props$type = _props.type,
283
279
  type = _props$type === void 0 ? 'auto' : _props$type;
284
280
  var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -338,9 +334,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
338
334
  formMode: 'add'
339
335
  }, initData)
340
336
  });
341
- return (0, _umi.connect)(function (_ref10) {
342
- var modelName = _ref10[namespace],
343
- loading = _ref10.loading;
337
+ return (0, _umi.connect)(function (_ref9) {
338
+ var modelName = _ref9[namespace],
339
+ loading = _ref9.loading;
344
340
  return {
345
341
  formData: modelName.formData,
346
342
  formOperates: modelName.formOperates,
@@ -351,11 +347,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
351
347
  };
352
348
  })(WrappedComponent);
353
349
  };
354
- var Index = function Index(_ref11) {
355
- var namespace = _ref11.ldId,
356
- initData = _ref11.initData,
357
- overModel = _ref11.overModel,
358
- props = (0, _objectWithoutProperties2.default)(_ref11, _excluded4);
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);
359
355
  var match = (0, _umi.useRouteMatch)();
360
356
  var Component = (0, _ahooks.useCreation)(function () {
361
357
  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.15-1",
3
+ "version": "0.0.15-2",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",