@luck-design-biz/luckda 0.0.6 → 0.0.7-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 (9) hide show
  1. package/es/components/LdAutoForm/index.js +2 -2
  2. package/es/components/LdFormList/index.js +2 -2
  3. package/es/components/LdGrid/index.js +1 -0
  4. package/es/helper/action.js +22 -20
  5. package/lib/components/LdAutoForm/index.js +2 -2
  6. package/lib/components/LdFormList/index.js +2 -2
  7. package/lib/components/LdGrid/index.js +1 -0
  8. package/lib/helper/action.js +22 -20
  9. package/package.json +1 -1
package/es/components/LdAutoForm/index.js CHANGED
@@ -114,9 +114,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
114
114
  return _params;
115
115
  }
116
116
  }, onQuery), {}, {
117
- format: function format(data) {
117
+ format: function format(data, res) {
118
118
  var formItemData = _objectSpread({}, formItemDataFormat(columns, data));
119
- if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
119
+ if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
120
120
  return formItemData;
121
121
  }
122
122
  }),
package/es/components/LdFormList/index.js CHANGED
@@ -114,11 +114,11 @@ var LdFormList = function LdFormList(_ref) {
114
114
  formData: props.formData,
115
115
  form_id: formKey,
116
116
  effcode: formCode
117
- }, function (success, indocno) {
117
+ }, function (success, indocno, res) {
118
118
  setSubmitLoading(false);
119
119
  if (success) {
120
120
  if (afterSubmit) {
121
- afterSubmit();
121
+ afterSubmit(success, indocno, res);
122
122
  } else {
123
123
  var _formListRef$current;
124
124
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
package/es/components/LdGrid/index.js CHANGED
@@ -50,6 +50,7 @@ var LdGrid = function LdGrid(_ref) {
50
50
  treeData: true,
51
51
  isFlow: true,
52
52
  renderIndex: false,
53
+ pagination: false,
53
54
  getDataPath: function getDataPath(data) {
54
55
  var _data$sidcc;
55
56
  return (_data$sidcc = data.sidcc) === null || _data$sidcc === void 0 ? void 0 : _data$sidcc.substring(1, data.sidcc.length - 1).split('/');
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/LdAutoForm/index.js CHANGED
@@ -122,9 +122,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
122
122
  return _params;
123
123
  }
124
124
  }, onQuery), {}, {
125
- format: function format(data) {
125
+ format: function format(data, res) {
126
126
  var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
127
- if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
127
+ if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
128
128
  return formItemData;
129
129
  }
130
130
  }),
package/lib/components/LdFormList/index.js CHANGED
@@ -121,11 +121,11 @@ var LdFormList = function LdFormList(_ref) {
121
121
  formData: props.formData,
122
122
  form_id: formKey,
123
123
  effcode: formCode
124
- }, function (success, indocno) {
124
+ }, function (success, indocno, res) {
125
125
  setSubmitLoading(false);
126
126
  if (success) {
127
127
  if (afterSubmit) {
128
- afterSubmit();
128
+ afterSubmit(success, indocno, res);
129
129
  } else {
130
130
  var _formListRef$current;
131
131
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
package/lib/components/LdGrid/index.js CHANGED
@@ -58,6 +58,7 @@ var LdGrid = function LdGrid(_ref) {
58
58
  treeData: true,
59
59
  isFlow: true,
60
60
  renderIndex: false,
61
+ pagination: false,
61
62
  getDataPath: function getDataPath(data) {
62
63
  var _data$sidcc;
63
64
  return (_data$sidcc = data.sidcc) === null || _data$sidcc === void 0 ? void 0 : _data$sidcc.substring(1, data.sidcc.length - 1).split('/');
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.6",
3
+ "version": "0.0.7-2",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",