@luck-design-biz/luckda 0.0.14 → 0.0.15

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.
@@ -9,7 +9,6 @@ import { AutoForm } from '@luck-design-biz/base/FormList';
9
9
  import ldBuilder from '../../helper/ldBuilder';
10
10
  import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from '../../utils';
11
11
  import { LuckDaContext } from '../Builder';
12
- var defaultOpe = ['read', 'add', 'update', 'delete'];
13
12
  var buildLdAutoForm = function buildLdAutoForm(_ref) {
14
13
  var _ref$columns = _ref.columns,
15
14
  columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -133,8 +132,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
133
132
  })
134
133
  // onAdd={onOperate(onAdd, 'add')}
135
134
  ,
136
- onUpdate: onOperate(onUpdate, 'update'),
137
- operates: defaultOpe
135
+ onUpdate: onOperate(onUpdate, 'update')
138
136
  }, formConfig), basicItems);
139
137
  };
140
138
  export default ldBuilder(buildLdAutoForm);
@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
5
5
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
6
- var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
6
+ var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
7
7
  _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
8
8
  _excluded3 = ["ldId", "initData", "overModel"];
9
9
  import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
@@ -20,6 +20,7 @@ import { LuckDaContext } from '../Builder';
20
20
  import { LuckDaPopContext } from '../LdPop';
21
21
  import createModel from './model';
22
22
  import { onBatchSubmitAction } from '../../helper/action';
23
+ import { isArray, sortBy, mapValues } from 'lodash';
23
24
 
24
25
  // 组件
25
26
  var LdFormList = function LdFormList(_ref) {
@@ -27,6 +28,7 @@ var LdFormList = function LdFormList(_ref) {
27
28
  var namespace = _ref.namespace,
28
29
  formState = _ref.formState,
29
30
  formMode = _ref.formMode,
31
+ formOperates = _ref.formOperates,
30
32
  loading = _ref.loading,
31
33
  wrapperRef = _ref.wrapperRef,
32
34
  readOnly = _ref.readOnly,
@@ -54,7 +56,8 @@ var LdFormList = function LdFormList(_ref) {
54
56
  defaultLayout = _ref2.affixLayout;
55
57
  var _ref3 = useContext(LuckDaContext) || {},
56
58
  dataSets = _ref3.dataSets,
57
- doAction = _ref3.doAction;
59
+ doAction = _ref3.doAction,
60
+ resources = _ref3.resources;
58
61
  var formListRef = useRef(null);
59
62
  useImperativeHandle(wrapperRef, function () {
60
63
  return _objectSpread(_objectSpread({}, formListRef.current), {}, {
@@ -150,7 +153,15 @@ var LdFormList = function LdFormList(_ref) {
150
153
  formRef: formListRef,
151
154
  renderExtra: renderExtra
152
155
  });
153
- var formList = renderFormList(formConfig);
156
+ var formList = useCreation(function () {
157
+ var _list = renderFormList(formConfig);
158
+ var extraList = renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
159
+ var list = _list.concat(extraList);
160
+ return sortBy(list, function (o) {
161
+ var _o$props;
162
+ return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
163
+ });
164
+ }, [formConfig]);
154
165
  var mainDataSetKey = (_formList$find = formList.find(function (i) {
155
166
  return i.id === mainFormLdId;
156
167
  })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
@@ -158,7 +169,10 @@ var LdFormList = function LdFormList(_ref) {
158
169
  editFlow: true,
159
170
  formState: formState,
160
171
  formMode: formMode,
161
- loading: loading || submitLoading
172
+ loading: loading || submitLoading,
173
+ formOperates: mapValues(formOperates, function () {
174
+ return resources;
175
+ })
162
176
  }, props, {
163
177
  modelName: namespace,
164
178
  ref: formListRef,
@@ -175,64 +189,67 @@ var LdFormList = function LdFormList(_ref) {
175
189
  title: saveBtnTitle,
176
190
  layout: affixLayout || defaultLayout
177
191
  }), formList.map(function (formProps) {
178
- var _ref7 = formProps || {},
179
- ldId = _ref7.id,
180
- _ref7$header = _ref7.header,
181
- header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
182
- title = _ref7.title,
183
- _readOnly = _ref7.readOnly,
184
- _ref7$extraConfig = _ref7.extraConfig,
185
- extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
186
- _ref7$renderTopLeft = _ref7.renderTopLeft,
187
- _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
188
- return /*#__PURE__*/React.createElement(React.Fragment, null);
189
- } : _ref7$renderTopLeft,
190
- _props = _objectWithoutProperties(_ref7, _excluded2);
191
- var _props$type = _props.type,
192
- type = _props$type === void 0 ? 'auto' : _props$type;
193
- var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
194
- if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
195
- title: title || ldId,
196
- extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
197
- id: ldId,
198
- key: ldId,
199
- mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
200
- }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
201
- ldId: ldId,
202
- mainFormLdId: mainFormLdId,
203
- mainDataSetKey: mainDataSetKey,
204
- readOnly: readOnly || _readOnly,
205
- onValueChange: handleValueChange,
206
- ticketData: props.ticketData,
207
- renderTopLeft: function renderTopLeft() {
208
- return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
209
- }
210
- })));
211
- return /*#__PURE__*/React.createElement(Fragment, {
212
- key: ldId
213
- }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
214
- title: title || ldId,
215
- id: ldId
216
- }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
217
- style: {
218
- textAlign: 'right'
219
- }
220
- }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
221
- ldId: ldId,
222
- mainFormLdId: mainFormLdId,
223
- mainDataSetKey: mainDataSetKey,
224
- readOnly: readOnly || _readOnly,
225
- onValueChange: handleValueChange,
226
- ticketData: props.ticketData,
227
- renderTopLeft: function renderTopLeft() {
228
- return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
229
- }
230
- })));
231
- }), ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
232
- var _child$type;
233
- return /*#__PURE__*/React.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? {
234
- mode: child.props.mode || 'tab'
235
- } : {});
192
+ if (formProps.dataSetKey) {
193
+ var _ref7 = formProps || {},
194
+ ldId = _ref7.id,
195
+ _ref7$header = _ref7.header,
196
+ header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
197
+ title = _ref7.title,
198
+ _readOnly = _ref7.readOnly,
199
+ _ref7$extraConfig = _ref7.extraConfig,
200
+ extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
201
+ _ref7$renderTopLeft = _ref7.renderTopLeft,
202
+ _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
203
+ return /*#__PURE__*/React.createElement(React.Fragment, null);
204
+ } : _ref7$renderTopLeft,
205
+ _props = _objectWithoutProperties(_ref7, _excluded2);
206
+ var _props$type = _props.type,
207
+ type = _props$type === void 0 ? 'auto' : _props$type;
208
+ var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
209
+ if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
210
+ title: title || ldId,
211
+ extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
212
+ id: ldId,
213
+ key: ldId,
214
+ mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
215
+ }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
216
+ ldId: ldId,
217
+ mainFormLdId: mainFormLdId,
218
+ mainDataSetKey: mainDataSetKey,
219
+ readOnly: readOnly || _readOnly,
220
+ onValueChange: handleValueChange,
221
+ ticketData: props.ticketData,
222
+ renderTopLeft: function renderTopLeft() {
223
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
224
+ }
225
+ })));
226
+ return /*#__PURE__*/React.createElement(Fragment, {
227
+ key: ldId
228
+ }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
229
+ title: title || ldId,
230
+ id: ldId
231
+ }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
232
+ style: {
233
+ textAlign: 'right'
234
+ }
235
+ }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
236
+ ldId: ldId,
237
+ mainFormLdId: mainFormLdId,
238
+ mainDataSetKey: mainDataSetKey,
239
+ readOnly: readOnly || _readOnly,
240
+ onValueChange: handleValueChange,
241
+ ticketData: props.ticketData,
242
+ renderTopLeft: function renderTopLeft() {
243
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
244
+ }
245
+ })));
246
+ }
247
+ return ChildrenUtil.deepMap(formProps, function (child) {
248
+ var _child$type;
249
+ return /*#__PURE__*/React.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? _objectSpread(_objectSpread({}, child.props), {}, {
250
+ mode: child.props.mode || 'tab'
251
+ }) : child.props);
252
+ })[0];
236
253
  }));
237
254
  };
238
255
 
@@ -12,7 +12,6 @@ import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall } from '../
12
12
  import { defaultComName } from '../../helper/form';
13
13
  import { LuckDaContext } from '../Builder';
14
14
  import styles from './index.less';
15
- var defaultOpe = ['read', 'add', 'update', 'delete'];
16
15
  var buildLdGridForm = function buildLdGridForm(_ref) {
17
16
  var _ref$columns = _ref.columns,
18
17
  columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -133,7 +132,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
133
132
  };
134
133
  return /*#__PURE__*/React.createElement(GridForm, _extends({
135
134
  noAddon: true,
136
- operates: defaultOpe,
137
135
  orderByAdd: "asc",
138
136
  rowSelection: true,
139
137
  type: type,
package/es/utils/grid.js CHANGED
@@ -1,3 +1,4 @@
1
+ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
1
2
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
2
3
  var _excluded = ["comName", "property"],
3
4
  _excluded2 = ["name"],
@@ -33,7 +34,7 @@ export function getColumnRender(name, type) {
33
34
  break;
34
35
  case 'year':
35
36
  render = function render(text, record) {
36
- return record["".concat(name, "_virtual")] || (text ? moment(value).format('YYYY-MM-DD') : undefined);
37
+ return record["".concat(name, "_virtual")] || (text ? moment(text).format('YYYY-MM-DD') : undefined);
37
38
  };
38
39
  break;
39
40
  case 'user':
@@ -95,11 +96,11 @@ export var getGridColumn = function getGridColumn() {
95
96
  filter = _merge.filter,
96
97
  filterParams = _merge.filterParams,
97
98
  _props = _objectWithoutProperties(_merge, _excluded3);
98
- var data = {
99
+ var data = _objectSpread(_objectSpread({}, _props), {}, {
99
100
  field: name,
100
101
  title: _props.label,
101
102
  render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
102
- };
103
+ });
103
104
  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
104
105
  // data.filter = false;
105
106
  if (!isNil(filter)) {
@@ -109,6 +110,7 @@ export var getGridColumn = function getGridColumn() {
109
110
  } else if (!isTreeGrid && !isVirtual) {
110
111
  var _props$config2;
111
112
  if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
113
+ data.field = "".concat(name, "_virtual");
112
114
  data.filter = 'text';
113
115
  return data;
114
116
  }
@@ -17,7 +17,6 @@ var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
17
17
  var _utils = require("../../utils");
18
18
  var _Builder = require("../Builder");
19
19
  var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
20
- var defaultOpe = ['read', 'add', 'update', 'delete'];
21
20
  var buildLdAutoForm = function buildLdAutoForm(_ref) {
22
21
  var _ref$columns = _ref.columns,
23
22
  columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -141,8 +140,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
141
140
  })
142
141
  // onAdd={onOperate(onAdd, 'add')}
143
142
  ,
144
- onUpdate: onOperate(onUpdate, 'update'),
145
- operates: defaultOpe
143
+ onUpdate: onOperate(onUpdate, 'update')
146
144
  }, formConfig), basicItems);
147
145
  };
148
146
  var _default = (0, _ldBuilder.default)(buildLdAutoForm);
@@ -25,7 +25,8 @@ var _Builder = require("../Builder");
25
25
  var _LdPop = require("../LdPop");
26
26
  var _model = _interopRequireDefault(require("./model"));
27
27
  var _action = require("../../helper/action");
28
- var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
28
+ var _lodash = require("lodash");
29
+ var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
29
30
  _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
30
31
  _excluded3 = ["ldId", "initData", "overModel"];
31
32
  // 组件
@@ -34,6 +35,7 @@ var LdFormList = function LdFormList(_ref) {
34
35
  var namespace = _ref.namespace,
35
36
  formState = _ref.formState,
36
37
  formMode = _ref.formMode,
38
+ formOperates = _ref.formOperates,
37
39
  loading = _ref.loading,
38
40
  wrapperRef = _ref.wrapperRef,
39
41
  readOnly = _ref.readOnly,
@@ -61,7 +63,8 @@ var LdFormList = function LdFormList(_ref) {
61
63
  defaultLayout = _ref2.affixLayout;
62
64
  var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
63
65
  dataSets = _ref3.dataSets,
64
- doAction = _ref3.doAction;
66
+ doAction = _ref3.doAction,
67
+ resources = _ref3.resources;
65
68
  var formListRef = (0, _react.useRef)(null);
66
69
  (0, _react.useImperativeHandle)(wrapperRef, function () {
67
70
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -157,7 +160,15 @@ var LdFormList = function LdFormList(_ref) {
157
160
  formRef: formListRef,
158
161
  renderExtra: renderExtra
159
162
  });
160
- var formList = renderFormList(formConfig);
163
+ var formList = (0, _ahooks.useCreation)(function () {
164
+ var _list = renderFormList(formConfig);
165
+ var extraList = renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
166
+ var list = _list.concat(extraList);
167
+ return (0, _lodash.sortBy)(list, function (o) {
168
+ var _o$props;
169
+ return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
170
+ });
171
+ }, [formConfig]);
161
172
  var mainDataSetKey = (_formList$find = formList.find(function (i) {
162
173
  return i.id === mainFormLdId;
163
174
  })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
@@ -165,7 +176,10 @@ var LdFormList = function LdFormList(_ref) {
165
176
  editFlow: true,
166
177
  formState: formState,
167
178
  formMode: formMode,
168
- loading: loading || submitLoading
179
+ loading: loading || submitLoading,
180
+ formOperates: (0, _lodash.mapValues)(formOperates, function () {
181
+ return resources;
182
+ })
169
183
  }, props, {
170
184
  modelName: namespace,
171
185
  ref: formListRef,
@@ -182,64 +196,67 @@ var LdFormList = function LdFormList(_ref) {
182
196
  title: saveBtnTitle,
183
197
  layout: affixLayout || defaultLayout
184
198
  }), formList.map(function (formProps) {
185
- var _ref7 = formProps || {},
186
- ldId = _ref7.id,
187
- _ref7$header = _ref7.header,
188
- header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
189
- title = _ref7.title,
190
- _readOnly = _ref7.readOnly,
191
- _ref7$extraConfig = _ref7.extraConfig,
192
- extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
193
- _ref7$renderTopLeft = _ref7.renderTopLeft,
194
- _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
195
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
196
- } : _ref7$renderTopLeft,
197
- _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
198
- var _props$type = _props.type,
199
- type = _props$type === void 0 ? 'auto' : _props$type;
200
- var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
201
- if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
202
- title: title || ldId,
203
- extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
204
- id: ldId,
205
- key: ldId,
206
- mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
207
- }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
208
- ldId: ldId,
209
- mainFormLdId: mainFormLdId,
210
- mainDataSetKey: mainDataSetKey,
211
- readOnly: readOnly || _readOnly,
212
- onValueChange: handleValueChange,
213
- ticketData: props.ticketData,
214
- renderTopLeft: function renderTopLeft() {
215
- return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
216
- }
217
- })));
218
- return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
219
- key: ldId
220
- }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
221
- title: title || ldId,
222
- id: ldId
223
- }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
224
- style: {
225
- textAlign: 'right'
226
- }
227
- }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
228
- ldId: ldId,
229
- mainFormLdId: mainFormLdId,
230
- mainDataSetKey: mainDataSetKey,
231
- readOnly: readOnly || _readOnly,
232
- onValueChange: handleValueChange,
233
- ticketData: props.ticketData,
234
- renderTopLeft: function renderTopLeft() {
235
- return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
236
- }
237
- })));
238
- }), _utils.ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
239
- var _child$type;
240
- return /*#__PURE__*/_react.default.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? {
241
- mode: child.props.mode || 'tab'
242
- } : {});
199
+ if (formProps.dataSetKey) {
200
+ var _ref7 = formProps || {},
201
+ ldId = _ref7.id,
202
+ _ref7$header = _ref7.header,
203
+ header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
204
+ title = _ref7.title,
205
+ _readOnly = _ref7.readOnly,
206
+ _ref7$extraConfig = _ref7.extraConfig,
207
+ extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
208
+ _ref7$renderTopLeft = _ref7.renderTopLeft,
209
+ _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
210
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
211
+ } : _ref7$renderTopLeft,
212
+ _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
213
+ var _props$type = _props.type,
214
+ type = _props$type === void 0 ? 'auto' : _props$type;
215
+ var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
216
+ if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
217
+ title: title || ldId,
218
+ extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
219
+ id: ldId,
220
+ key: ldId,
221
+ mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
222
+ }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
223
+ ldId: ldId,
224
+ mainFormLdId: mainFormLdId,
225
+ mainDataSetKey: mainDataSetKey,
226
+ readOnly: readOnly || _readOnly,
227
+ onValueChange: handleValueChange,
228
+ ticketData: props.ticketData,
229
+ renderTopLeft: function renderTopLeft() {
230
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
231
+ }
232
+ })));
233
+ return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
234
+ key: ldId
235
+ }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
236
+ title: title || ldId,
237
+ id: ldId
238
+ }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
239
+ style: {
240
+ textAlign: 'right'
241
+ }
242
+ }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
243
+ ldId: ldId,
244
+ mainFormLdId: mainFormLdId,
245
+ mainDataSetKey: mainDataSetKey,
246
+ readOnly: readOnly || _readOnly,
247
+ onValueChange: handleValueChange,
248
+ ticketData: props.ticketData,
249
+ renderTopLeft: function renderTopLeft() {
250
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
251
+ }
252
+ })));
253
+ }
254
+ return _utils.ChildrenUtil.deepMap(formProps, function (child) {
255
+ var _child$type;
256
+ return /*#__PURE__*/_react.default.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child.props), {}, {
257
+ mode: child.props.mode || 'tab'
258
+ }) : child.props);
259
+ })[0];
243
260
  }));
244
261
  };
245
262
 
@@ -20,7 +20,6 @@ var _form = require("../../helper/form");
20
20
  var _Builder = require("../Builder");
21
21
  var _index = _interopRequireDefault(require("./index.less"));
22
22
  var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
23
- var defaultOpe = ['read', 'add', 'update', 'delete'];
24
23
  var buildLdGridForm = function buildLdGridForm(_ref) {
25
24
  var _ref$columns = _ref.columns,
26
25
  columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -141,7 +140,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
141
140
  };
142
141
  return /*#__PURE__*/_react.default.createElement(_FormList.GridForm, (0, _extends2.default)({
143
142
  noAddon: true,
144
- operates: defaultOpe,
145
143
  orderByAdd: "asc",
146
144
  rowSelection: true,
147
145
  type: type,
package/lib/utils/grid.js CHANGED
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.getColumnRender = getColumnRender;
8
8
  exports.getGridColumn = void 0;
9
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
9
10
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
10
11
  var _react = _interopRequireDefault(require("react"));
11
12
  var _umi = require("umi");
@@ -40,7 +41,7 @@ function getColumnRender(name, type) {
40
41
  break;
41
42
  case 'year':
42
43
  render = function render(text, record) {
43
- return record["".concat(name, "_virtual")] || (text ? (0, _moment.default)(value).format('YYYY-MM-DD') : undefined);
44
+ return record["".concat(name, "_virtual")] || (text ? (0, _moment.default)(text).format('YYYY-MM-DD') : undefined);
44
45
  };
45
46
  break;
46
47
  case 'user':
@@ -102,11 +103,11 @@ var getGridColumn = function getGridColumn() {
102
103
  filter = _merge.filter,
103
104
  filterParams = _merge.filterParams,
104
105
  _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
105
- var data = {
106
+ var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
106
107
  field: name,
107
108
  title: _props.label,
108
109
  render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
109
- };
110
+ });
110
111
  if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
111
112
  // data.filter = false;
112
113
  if (!(0, _lodash.isNil)(filter)) {
@@ -116,6 +117,7 @@ var getGridColumn = function getGridColumn() {
116
117
  } else if (!isTreeGrid && !isVirtual) {
117
118
  var _props$config2;
118
119
  if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
120
+ data.field = "".concat(name, "_virtual");
119
121
  data.filter = 'text';
120
122
  return data;
121
123
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.14",
3
+ "version": "0.0.15",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",