es-grid-template 1.1.6 → 1.1.7

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.
@@ -216,7 +216,7 @@ const GridEdit = props => {
216
216
  return {
217
217
  row,
218
218
  col,
219
- value: data[row][columnKey]
219
+ value: dataSource[row][columnKey]
220
220
  };
221
221
  });
222
222
 
@@ -772,9 +772,7 @@ const GridEdit = props => {
772
772
  }, /*#__PURE__*/_react.default.createElement("form", {
773
773
  onSubmit: handleSubmit(onSubmit)
774
774
  }, /*#__PURE__*/_react.default.createElement(_TableGrid.default, (0, _extends2.default)({}, rest, {
775
- t: t
776
- // key={updateKey}
777
- ,
775
+ t: t,
778
776
  tableRef: tableRef,
779
777
  dataSource: dataSource,
780
778
  components: {
@@ -103,9 +103,8 @@ export type ColumnType<RecordType> = Omit<RcColumnType<RecordType>, 'headerTempl
103
103
  commandItems?: CommandItem[];
104
104
  children?: ColumnType<RecordType>[];
105
105
  };
106
- export type ColumnEditType<RecordType> = ColumnType<RecordType> & {
106
+ export type ColumnEditType<RecordType> = Omit<ColumnType<RecordType>, 'children'> & {
107
107
  editType?: EditType | ((rowData?: any) => EditType);
108
- template?: ReactNode | ReactElement | ((value: any, record: RecordType, index: number) => ReactNode | ReactElement);
109
108
  disable?: boolean | ((rowData: any) => boolean);
110
109
  isClearable?: boolean;
111
110
  maxDate?: any;
@@ -115,6 +114,7 @@ export type ColumnEditType<RecordType> = ColumnType<RecordType> & {
115
114
  max?: number;
116
115
  min?: number;
117
116
  editSelectSettings?: IEditSelectSettings;
117
+ children?: ColumnEditType<RecordType>[];
118
118
  };
119
119
  export type ColumnsType<RecordType = AnyObject> = ColumnType<RecordType>[];
120
120
  export type ColumnsEditType<RecordType = AnyObject> = ColumnEditType<RecordType>[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "es-grid-template",
3
- "version": "1.1.6",
3
+ "version": "1.1.7",
4
4
  "description": "es-grid-template",
5
5
  "keywords": [
6
6
  "react",
@@ -59,7 +59,7 @@
59
59
  "rc-checkbox": "^3.5.0",
60
60
  "rc-dropdown": "^4.2.1",
61
61
  "rc-field-form": "^2.6.0",
62
- "rc-master-ui": "^1.1.1",
62
+ "rc-master-ui": "^1.1.15-5",
63
63
  "rc-select": "^14.16.3",
64
64
  "rc-tooltip": "^6.3.0",
65
65
  "rc-tree": "^5.10.1",