@luck-design-biz/luckda 0.0.12-8-test → 0.0.13

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/LdGridForm/index.js +12 -4
  2. package/es/helper/action.js +0 -1
  3. package/es/utils/form.js +4 -5
  4. package/es/utils/grid.js +6 -0
  5. package/lib/components/LdGridForm/index.js +12 -4
  6. package/lib/helper/action.js +0 -1
  7. package/lib/utils/form.js +4 -5
  8. package/lib/utils/grid.js +6 -0
  9. package/package.json +1 -1
package/es/components/LdGridForm/index.js CHANGED
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
- var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
5
+ var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
6
6
  import React, { useContext, useRef } from 'react';
7
7
  import { useCreation, useMemoizedFn } from 'ahooks';
8
8
  import { transform } from 'lodash';
@@ -50,6 +50,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
50
50
  _ref$ticketData = _ref.ticketData,
51
51
  ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
52
52
  className = _ref.className,
53
+ formRef = _ref.formRef,
54
+ formMode = _ref.formMode,
53
55
  props = _objectWithoutProperties(_ref, _excluded);
54
56
  var _ref2 = useContext(LuckDaContext) || {},
55
57
  setFieldProps = _ref2.setFieldProps;
@@ -65,7 +67,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
65
67
  var _defaultValues = {};
66
68
  var _nodes = transform(gridColumns, function (result, col) {
67
69
  if (col.isShowInForm) {
68
- var _objectSpread2;
70
+ var _objectSpread2, _customColumn;
69
71
  var customColumn = columnsRewrite.find(function (column) {
70
72
  return column.field === col.field;
71
73
  }) || {};
@@ -74,7 +76,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
74
76
  mode: 'grid'
75
77
  });
76
78
  _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
77
- result.push(getFormColumn(type, col, customColumn));
79
+ result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
80
+ formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
81
+ moduleCode: moduleCode,
82
+ formRef: formRef,
83
+ formMode: formMode
84
+ })
85
+ })));
78
86
  }
79
87
  }, []);
80
88
  defaultValues.current = _defaultValues;
@@ -88,7 +96,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
88
96
  });
89
97
  })));
90
98
  return _nodes;
91
- }, [columns, columnsRewrite, isMain]);
99
+ }, [columns, columnsRewrite, isMain, formMode]);
92
100
  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
93
101
  var formConfig = {
94
102
  formId: ldId,
package/es/helper/action.js CHANGED
@@ -88,7 +88,6 @@ export var doAction = function doAction(action) {
88
88
  id: 'luckda.operates.Action',
89
89
  label: '行为'
90
90
  }));
91
- console.error(errorMsg);
92
91
  showPop(errorMsg);
93
92
  }
94
93
  };
package/es/utils/form.js CHANGED
@@ -65,7 +65,6 @@ export var formItemDataFormat = function formItemDataFormat() {
65
65
  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
66
66
  var omitValues = {};
67
67
  var data = transform(propsList, function (result, n) {
68
- var _values$name, _values$name2;
69
68
  var _ref2 = n || {},
70
69
  comName = _ref2.comName,
71
70
  property = _ref2.property,
@@ -103,7 +102,7 @@ export var formItemDataFormat = function formItemDataFormat() {
103
102
  result[name] = values[name];
104
103
  break;
105
104
  case 'upload':
106
- result[name] = ((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.spath) || ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.url);
105
+ result[name] = values[name];
107
106
  break;
108
107
  default:
109
108
  if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
@@ -125,7 +124,7 @@ export var dataFormat = function dataFormat() {
125
124
  // 姚小川说：冗余字段后端处理，不需要前端传给后端
126
125
  var values = clone(_values);
127
126
  var data = transform(propsList, function (result, n) {
128
- var _values$name3, _values$name4, _values$name$;
127
+ var _values$name, _values$name2, _values$name$;
129
128
  var _ref3 = n || {},
130
129
  comName = _ref3.comName,
131
130
  property = _ref3.property,
@@ -151,7 +150,7 @@ export var dataFormat = function dataFormat() {
151
150
  case 'group':
152
151
  if (isArray(values[name])) result[name] = values[name].map(function (v) {
153
152
  return v.value || v.key;
154
- }).join(',');else result[name] = !isNil((_values$name3 = values[name]) === null || _values$name3 === void 0 ? void 0 : _values$name3.value) ? values[name].value : ((_values$name4 = values[name]) === null || _values$name4 === void 0 ? void 0 : _values$name4.key) || null;
153
+ }).join(',');else result[name] = !isNil((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
155
154
  break;
156
155
  case 'switch':
157
156
  result[name] = values[name] ? 1 : 0;
@@ -163,7 +162,7 @@ export var dataFormat = function dataFormat() {
163
162
  result[name] = values[name] ? moment(values[name]).format('YYYY') : null;
164
163
  break;
165
164
  case 'upload':
166
- result[name] = values[name] && values[name][0] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
165
+ result[name] = values[name] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
167
166
  break;
168
167
  default:
169
168
  result[name] = values[name];
package/es/utils/grid.js CHANGED
@@ -69,6 +69,12 @@ export function getColumnRender(name, type) {
69
69
  }).join('/') : undefined;
70
70
  };
71
71
  break;
72
+ case 'upload':
73
+ render = function render(text, record) {
74
+ var _text$;
75
+ return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
76
+ };
77
+ break;
72
78
  default:
73
79
  }
74
80
  return render;
package/lib/components/LdGridForm/index.js CHANGED
@@ -20,7 +20,7 @@ var _utils = require("../../utils");
20
20
  var _form = require("../../helper/form");
21
21
  var _Builder = require("../Builder");
22
22
  var _index = _interopRequireDefault(require("./index.less"));
23
- var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
23
+ var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
24
24
  var defaultOpe = ['read', 'add', 'update', 'delete'];
25
25
  var buildLdGridForm = function buildLdGridForm(_ref) {
26
26
  var _ref$columns = _ref.columns,
@@ -58,6 +58,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
58
58
  _ref$ticketData = _ref.ticketData,
59
59
  ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
60
60
  className = _ref.className,
61
+ formRef = _ref.formRef,
62
+ formMode = _ref.formMode,
61
63
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
62
64
  var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
63
65
  setFieldProps = _ref2.setFieldProps;
@@ -73,7 +75,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
73
75
  var _defaultValues = {};
74
76
  var _nodes = (0, _lodash.transform)(gridColumns, function (result, col) {
75
77
  if (col.isShowInForm) {
76
- var _objectSpread2;
78
+ var _objectSpread2, _customColumn;
77
79
  var customColumn = columnsRewrite.find(function (column) {
78
80
  return column.field === col.field;
79
81
  }) || {};
@@ -82,7 +84,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
82
84
  mode: 'grid'
83
85
  });
84
86
  _defaultValues = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
85
- result.push((0, _utils.getFormColumn)(type, col, customColumn));
87
+ result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread5.default)((0, _objectSpread5.default)({}, customColumn), {}, {
88
+ formItemRewrite: (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
89
+ moduleCode: moduleCode,
90
+ formRef: formRef,
91
+ formMode: formMode
92
+ })
93
+ })));
86
94
  }
87
95
  }, []);
88
96
  defaultValues.current = _defaultValues;
@@ -96,7 +104,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
96
104
  });
97
105
  })));
98
106
  return _nodes;
99
- }, [columns, columnsRewrite, isMain]);
107
+ }, [columns, columnsRewrite, isMain, formMode]);
100
108
  var defaultDataSource = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
101
109
  var formConfig = {
102
110
  formId: ldId,
package/lib/helper/action.js CHANGED
@@ -95,7 +95,6 @@ var doAction = function doAction(action) {
95
95
  id: 'luckda.operates.Action',
96
96
  label: '行为'
97
97
  }));
98
- console.error(errorMsg);
99
98
  (0, _utils.showPop)(errorMsg);
100
99
  }
101
100
  };
package/lib/utils/form.js CHANGED
@@ -73,7 +73,6 @@ var formItemDataFormat = function formItemDataFormat() {
73
73
  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
74
74
  var omitValues = {};
75
75
  var data = (0, _lodash.transform)(propsList, function (result, n) {
76
- var _values$name, _values$name2;
77
76
  var _ref2 = n || {},
78
77
  comName = _ref2.comName,
79
78
  property = _ref2.property,
@@ -111,7 +110,7 @@ var formItemDataFormat = function formItemDataFormat() {
111
110
  result[name] = values[name];
112
111
  break;
113
112
  case 'upload':
114
- result[name] = ((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.spath) || ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.url);
113
+ result[name] = values[name];
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];
@@ -134,7 +133,7 @@ var dataFormat = function dataFormat() {
134
133
  // 姚小川说：冗余字段后端处理，不需要前端传给后端
135
134
  var values = (0, _lodash.clone)(_values);
136
135
  var data = (0, _lodash.transform)(propsList, function (result, n) {
137
- var _values$name3, _values$name4, _values$name$;
136
+ var _values$name, _values$name2, _values$name$;
138
137
  var _ref3 = n || {},
139
138
  comName = _ref3.comName,
140
139
  property = _ref3.property,
@@ -160,7 +159,7 @@ var dataFormat = function dataFormat() {
160
159
  case 'group':
161
160
  if ((0, _lodash.isArray)(values[name])) result[name] = values[name].map(function (v) {
162
161
  return v.value || v.key;
163
- }).join(',');else result[name] = !(0, _lodash.isNil)((_values$name3 = values[name]) === null || _values$name3 === void 0 ? void 0 : _values$name3.value) ? values[name].value : ((_values$name4 = values[name]) === null || _values$name4 === void 0 ? void 0 : _values$name4.key) || null;
162
+ }).join(',');else result[name] = !(0, _lodash.isNil)((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
164
163
  break;
165
164
  case 'switch':
166
165
  result[name] = values[name] ? 1 : 0;
@@ -172,7 +171,7 @@ var dataFormat = function dataFormat() {
172
171
  result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
173
172
  break;
174
173
  case 'upload':
175
- result[name] = values[name] && values[name][0] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
174
+ result[name] = values[name] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
176
175
  break;
177
176
  default:
178
177
  result[name] = values[name];
package/lib/utils/grid.js CHANGED
@@ -76,6 +76,12 @@ function getColumnRender(name, type) {
76
76
  }).join('/') : undefined;
77
77
  };
78
78
  break;
79
+ case 'upload':
80
+ render = function render(text, record) {
81
+ var _text$;
82
+ return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
83
+ };
84
+ break;
79
85
  default:
80
86
  }
81
87
  return render;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.12-8-test",
3
+ "version": "0.0.13",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",