amis 1.10.1-beta.0 → 1.10.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (164) hide show
  1. package/lib/Schema.d.ts +1 -1
  2. package/lib/Schema.js.map +1 -1
  3. package/lib/components/Avatar.d.ts +10 -10
  4. package/lib/components/ListGroup.d.ts +10 -10
  5. package/lib/components/Range.js +8 -2
  6. package/lib/components/Range.js.map +2 -2
  7. package/lib/components/ResultBox.d.ts +41 -40
  8. package/lib/components/ResultBox.js +23 -19
  9. package/lib/components/ResultBox.js.map +2 -2
  10. package/lib/components/Select.js +5 -3
  11. package/lib/components/Select.js.map +2 -2
  12. package/lib/components/Steps.d.ts +1 -0
  13. package/lib/components/Steps.js +8 -6
  14. package/lib/components/Steps.js.map +2 -2
  15. package/lib/components/condition-builder/index.d.ts +12 -2
  16. package/lib/components/condition-builder/index.js +40 -4
  17. package/lib/components/condition-builder/index.js.map +2 -2
  18. package/lib/components/formula/Editor.js +1 -1
  19. package/lib/components/formula/Editor.js.map +2 -2
  20. package/lib/components/formula/VariableList.js +2 -2
  21. package/lib/components/formula/VariableList.js.map +2 -2
  22. package/lib/components/table/index.d.ts +9 -7
  23. package/lib/components/table/index.js +102 -102
  24. package/lib/components/table/index.js.map +2 -2
  25. package/lib/helper.css.map +1 -1
  26. package/lib/index.d.ts +1 -0
  27. package/lib/index.js +2 -1
  28. package/lib/index.js.map +2 -2
  29. package/lib/renderers/Action.js +18 -11
  30. package/lib/renderers/Action.js.map +2 -2
  31. package/lib/renderers/ButtonGroup.d.ts +2 -2
  32. package/lib/renderers/ButtonGroup.js.map +1 -1
  33. package/lib/renderers/CRUD.js +2 -2
  34. package/lib/renderers/CRUD.js.map +2 -2
  35. package/lib/renderers/CRUD2.d.ts +213 -0
  36. package/lib/renderers/CRUD2.js +724 -0
  37. package/lib/renderers/CRUD2.js.map +13 -0
  38. package/lib/renderers/Card2.d.ts +1 -1
  39. package/lib/renderers/Card2.js +1 -2
  40. package/lib/renderers/Card2.js.map +2 -2
  41. package/lib/renderers/Cards.d.ts +3 -0
  42. package/lib/renderers/Cards.js +52 -5
  43. package/lib/renderers/Cards.js.map +2 -2
  44. package/lib/renderers/Form/ConditionBuilder.d.ts +10 -0
  45. package/lib/renderers/Form/ConditionBuilder.js +6 -2
  46. package/lib/renderers/Form/ConditionBuilder.js.map +2 -2
  47. package/lib/renderers/Form/DiffEditor.d.ts +66 -20
  48. package/lib/renderers/Form/Editor.d.ts +66 -20
  49. package/lib/renderers/Form/Item.d.ts +4 -0
  50. package/lib/renderers/Form/Item.js +1 -1
  51. package/lib/renderers/Form/Item.js.map +2 -2
  52. package/lib/renderers/Form/TreeSelect.d.ts +0 -1
  53. package/lib/renderers/Form/TreeSelect.js +1 -9
  54. package/lib/renderers/Form/TreeSelect.js.map +2 -2
  55. package/lib/renderers/Form/index.js +8 -4
  56. package/lib/renderers/Form/index.js.map +2 -2
  57. package/lib/renderers/Icon.d.ts +1 -1
  58. package/lib/renderers/Icon.js +13 -8
  59. package/lib/renderers/Icon.js.map +2 -2
  60. package/lib/renderers/Table/index.d.ts +1 -0
  61. package/lib/renderers/Table/index.js +19 -5
  62. package/lib/renderers/Table/index.js.map +2 -2
  63. package/lib/renderers/Table-v2/index.d.ts +8 -5
  64. package/lib/renderers/Table-v2/index.js +83 -54
  65. package/lib/renderers/Table-v2/index.js.map +2 -2
  66. package/lib/store/combo.d.ts +72 -22
  67. package/lib/store/crud.d.ts +2 -0
  68. package/lib/store/crud.js +21 -1
  69. package/lib/store/crud.js.map +2 -2
  70. package/lib/store/form.d.ts +30 -9
  71. package/lib/store/form.js +28 -10
  72. package/lib/store/form.js.map +2 -2
  73. package/lib/store/formItem.d.ts +3 -1
  74. package/lib/store/formItem.js +3 -5
  75. package/lib/store/formItem.js.map +2 -2
  76. package/lib/store/list.d.ts +2 -0
  77. package/lib/store/list.js +8 -0
  78. package/lib/store/list.js.map +2 -2
  79. package/lib/store/table.d.ts +60 -18
  80. package/lib/themes/ang-ie11.css +166 -19
  81. package/lib/themes/ang.css +166 -19
  82. package/lib/themes/ang.css.map +1 -1
  83. package/lib/themes/antd-ie11.css +166 -19
  84. package/lib/themes/antd.css +166 -19
  85. package/lib/themes/antd.css.map +1 -1
  86. package/lib/themes/cxd-ie11.css +166 -19
  87. package/lib/themes/cxd.css +166 -19
  88. package/lib/themes/cxd.css.map +1 -1
  89. package/lib/themes/dark-ie11.css +166 -19
  90. package/lib/themes/dark.css +166 -19
  91. package/lib/themes/dark.css.map +1 -1
  92. package/lib/themes/default-ie11.css +166 -19
  93. package/lib/themes/default.css +166 -19
  94. package/lib/themes/default.css.map +1 -1
  95. package/lib/types.d.ts +1 -1
  96. package/lib/types.js.map +1 -1
  97. package/lib/utils/icon.js +7 -0
  98. package/lib/utils/icon.js.map +2 -2
  99. package/package.json +1 -1
  100. package/schema.json +28 -25
  101. package/scss/_mixins.scss +1 -1
  102. package/scss/components/_condition-builder.scss +11 -0
  103. package/scss/components/_crud.scss +8 -3
  104. package/scss/components/_crud2.scss +148 -0
  105. package/scss/components/_result-box.scss +27 -8
  106. package/scss/components/_steps.scss +21 -26
  107. package/scss/components/_table-v2.scss +1 -3
  108. package/scss/components/form/_select.scss +4 -0
  109. package/scss/themes/_common.scss +1 -0
  110. package/sdk/ang-ie11.css +203 -20
  111. package/sdk/ang.css +203 -20
  112. package/sdk/antd-ie11.css +203 -20
  113. package/sdk/antd.css +203 -20
  114. package/sdk/barcode.js +51 -51
  115. package/sdk/charts.js +14 -14
  116. package/sdk/codemirror.js +7 -7
  117. package/sdk/color-picker.js +65 -65
  118. package/sdk/cropperjs.js +2 -2
  119. package/sdk/cxd-ie11.css +203 -20
  120. package/sdk/cxd.css +203 -20
  121. package/sdk/dark-ie11.css +203 -20
  122. package/sdk/dark.css +203 -20
  123. package/sdk/exceljs.js +1 -1
  124. package/sdk/helper.css.map +1 -1
  125. package/sdk/markdown.js +69 -69
  126. package/sdk/papaparse.js +1 -1
  127. package/sdk/renderers/Form/CityDB.js +1 -1
  128. package/sdk/rest.js +16 -16
  129. package/sdk/rich-text.js +62 -62
  130. package/sdk/sdk-ie11.css +203 -20
  131. package/sdk/sdk.css +203 -20
  132. package/sdk/sdk.js +1344 -1340
  133. package/sdk/thirds/hls.js/hls.js +1 -1
  134. package/sdk/thirds/mpegts.js/mpegts.js +1 -1
  135. package/sdk/tinymce.js +57 -57
  136. package/src/Schema.ts +1 -0
  137. package/src/components/Range.tsx +14 -7
  138. package/src/components/ResultBox.tsx +65 -54
  139. package/src/components/Select.tsx +6 -5
  140. package/src/components/Steps.tsx +60 -18
  141. package/src/components/condition-builder/index.tsx +107 -8
  142. package/src/components/formula/Editor.tsx +1 -1
  143. package/src/components/formula/VariableList.tsx +2 -2
  144. package/src/components/table/index.tsx +190 -193
  145. package/src/index.tsx +1 -0
  146. package/src/renderers/Action.tsx +22 -11
  147. package/src/renderers/ButtonGroup.tsx +2 -2
  148. package/src/renderers/CRUD.tsx +2 -1
  149. package/src/renderers/CRUD2.tsx +1213 -0
  150. package/src/renderers/Card2.tsx +2 -3
  151. package/src/renderers/Cards.tsx +55 -10
  152. package/src/renderers/Form/ConditionBuilder.tsx +19 -2
  153. package/src/renderers/Form/Item.tsx +11 -1
  154. package/src/renderers/Form/TreeSelect.tsx +14 -16
  155. package/src/renderers/Form/index.tsx +11 -2
  156. package/src/renderers/Icon.tsx +8 -1
  157. package/src/renderers/Table/index.tsx +21 -5
  158. package/src/renderers/Table-v2/index.tsx +92 -72
  159. package/src/store/crud.ts +23 -1
  160. package/src/store/form.ts +31 -24
  161. package/src/store/formItem.ts +65 -52
  162. package/src/store/list.ts +10 -0
  163. package/src/types.ts +2 -1
  164. package/src/utils/icon.tsx +9 -0
@@ -133,6 +133,10 @@ export interface RowSelectionSchema {
133
133
  rowClick?: boolean;
134
134
  }
135
135
  export interface ExpandableSchema {
136
+ /**
137
+ * 对应渲染器类型
138
+ */
139
+ type: string;
136
140
  /**
137
141
  * 对应数据源的key值
138
142
  */
@@ -183,10 +187,6 @@ export interface TableSchemaV2 extends BaseSchema {
183
187
  * 表格行可展开配置
184
188
  */
185
189
  expandable?: ExpandableSchema;
186
- /**
187
- * 表格行可展开内容配置
188
- */
189
- expandableBody?: Array<SchemaObject>;
190
190
  /**
191
191
  * 粘性头部
192
192
  */
@@ -244,7 +244,7 @@ export interface TableV2Props extends RendererProps {
244
244
  store: ITableStore;
245
245
  togglable: boolean;
246
246
  }
247
- export default class TableRenderer extends React.Component<TableV2Props, object> {
247
+ export default class TableV2 extends React.Component<TableV2Props, object> {
248
248
  static contextType: React.Context<IScopedContext>;
249
249
  renderedToolbars: Array<string>;
250
250
  control: any;
@@ -281,3 +281,6 @@ export default class TableRenderer extends React.Component<TableV2Props, object>
281
281
  renderHeading(): JSX.Element | null;
282
282
  render(): JSX.Element;
283
283
  }
284
+ export declare class TableRenderer extends TableV2 {
285
+ receive(values: any, subPath?: string): void;
286
+ }
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.TableRenderer = void 0;
3
4
  var tslib_1 = require("tslib");
4
5
  var react_1 = (0, tslib_1.__importDefault)(require("react"));
5
6
  var react_dom_1 = require("react-dom");
@@ -19,9 +20,9 @@ var table_v2_1 = require("../../store/table-v2");
19
20
  var HeadCellSearchDropdown_1 = require("./HeadCellSearchDropdown");
20
21
  require("./TableCell");
21
22
  require("./ColumnToggler");
22
- var TableRenderer = /** @class */ (function (_super) {
23
- (0, tslib_1.__extends)(TableRenderer, _super);
24
- function TableRenderer(props, context) {
23
+ var TableV2 = /** @class */ (function (_super) {
24
+ (0, tslib_1.__extends)(TableV2, _super);
25
+ function TableV2(props, context) {
25
26
  var _this = _super.call(this, props) || this;
26
27
  _this.renderedToolbars = [];
27
28
  var scoped = context;
@@ -34,27 +35,26 @@ var TableRenderer = /** @class */ (function (_super) {
34
35
  _this.controlRef = _this.controlRef.bind(_this);
35
36
  var store = props.store, columnsTogglable = props.columnsTogglable, columns = props.columns;
36
37
  store.update({ columnsTogglable: columnsTogglable, columns: columns });
37
- TableRenderer_1.syncRows(store, props, undefined) && _this.syncSelected();
38
+ TableV2.syncRows(store, props, undefined) && _this.syncSelected();
38
39
  return _this;
39
40
  }
40
- TableRenderer_1 = TableRenderer;
41
- TableRenderer.prototype.componentWillUnmount = function () {
41
+ TableV2.prototype.componentWillUnmount = function () {
42
42
  var scoped = this.context;
43
43
  scoped.unRegisterComponent(this);
44
44
  };
45
- TableRenderer.prototype.controlRef = function (control) {
45
+ TableV2.prototype.controlRef = function (control) {
46
46
  // 因为 control 有可能被 n 层 hoc 包裹。
47
47
  while (control && control.getWrappedInstance) {
48
48
  control = control.getWrappedInstance();
49
49
  }
50
50
  this.control = control;
51
51
  };
52
- TableRenderer.prototype.syncSelected = function () {
52
+ TableV2.prototype.syncSelected = function () {
53
53
  var _a = this.props, store = _a.store, onSelect = _a.onSelect;
54
54
  onSelect &&
55
55
  onSelect(store.selectedRows.map(function (item) { return item.data; }), store.unSelectedRows.map(function (item) { return item.data; }));
56
56
  };
57
- TableRenderer.syncRows = function (store, props, prevProps) {
57
+ TableV2.syncRows = function (store, props, prevProps) {
58
58
  var source = props.source;
59
59
  var value = props.value || props.items;
60
60
  var rows = [];
@@ -120,7 +120,7 @@ var TableRenderer = /** @class */ (function (_super) {
120
120
  }
121
121
  return updateRows;
122
122
  };
123
- TableRenderer.prototype.componentDidUpdate = function (prevProps) {
123
+ TableV2.prototype.componentDidUpdate = function (prevProps) {
124
124
  var props = this.props;
125
125
  var store = props.store;
126
126
  if ((0, helper_1.anyChanged)(['columnsTogglable'], prevProps, props)) {
@@ -133,7 +133,7 @@ var TableRenderer = /** @class */ (function (_super) {
133
133
  !props.items &&
134
134
  (props.data !== prevProps.data ||
135
135
  (typeof props.source === 'string' && (0, tpl_builtin_1.isPureVariable)(props.source))))) {
136
- TableRenderer_1.syncRows(store, props, prevProps) && this.syncSelected();
136
+ TableV2.syncRows(store, props, prevProps) && this.syncSelected();
137
137
  }
138
138
  if (!(0, isEqual_1.default)(prevProps.columns, props.columns)) {
139
139
  store.update({
@@ -141,10 +141,10 @@ var TableRenderer = /** @class */ (function (_super) {
141
141
  });
142
142
  }
143
143
  };
144
- TableRenderer.prototype.getPopOverContainer = function () {
144
+ TableV2.prototype.getPopOverContainer = function () {
145
145
  return (0, react_dom_1.findDOMNode)(this);
146
146
  };
147
- TableRenderer.prototype.renderCellSchema = function (schema, props) {
147
+ TableV2.prototype.renderCellSchema = function (schema, props) {
148
148
  var render = this.props.render;
149
149
  // Table Cell SchemaObject转化成ReactNode
150
150
  if (schema && (0, helper_1.isObject)(schema)) {
@@ -158,7 +158,7 @@ var TableRenderer = /** @class */ (function (_super) {
158
158
  }
159
159
  return schema;
160
160
  };
161
- TableRenderer.prototype.renderSchema = function (key, schema, props) {
161
+ TableV2.prototype.renderSchema = function (key, schema, props) {
162
162
  var render = this.props.render;
163
163
  // Header、Footer等SchemaObject转化成ReactNode
164
164
  if (schema && (0, helper_1.isObject)(schema)) {
@@ -174,7 +174,7 @@ var TableRenderer = /** @class */ (function (_super) {
174
174
  return schema;
175
175
  };
176
176
  // editor传来的处理过的column 还可能包含其他字段
177
- TableRenderer.prototype.buildColumns = function (columns) {
177
+ TableV2.prototype.buildColumns = function (columns) {
178
178
  var _this = this;
179
179
  var _a = this.props, env = _a.env, render = _a.render, store = _a.store, popOverContainer = _a.popOverContainer, canAccessSuperData = _a.canAccessSuperData, showBadge = _a.showBadge, itemBadge = _a.itemBadge, cx = _a.classnames;
180
180
  var cols = [];
@@ -221,7 +221,7 @@ var TableRenderer = /** @class */ (function (_super) {
221
221
  Object.assign(clone, {
222
222
  render: function (text, record, rowIndex, colIndex) {
223
223
  var props = {};
224
- var item = store.getRowByIndex(rowIndex);
224
+ var item = store.getRowByIndex(rowIndex) || {};
225
225
  var obj = {
226
226
  children: _this.renderCellSchema(column, {
227
227
  data: item.locals,
@@ -296,7 +296,7 @@ var TableRenderer = /** @class */ (function (_super) {
296
296
  });
297
297
  return cols;
298
298
  };
299
- TableRenderer.prototype.buildSummary = function (key, summary) {
299
+ TableV2.prototype.buildSummary = function (key, summary) {
300
300
  var _this = this;
301
301
  var result = [];
302
302
  if (Array.isArray(summary)) {
@@ -332,11 +332,11 @@ var TableRenderer = /** @class */ (function (_super) {
332
332
  }
333
333
  return result.length ? result : null;
334
334
  };
335
- TableRenderer.prototype.reloadTarget = function (target, data) {
335
+ TableV2.prototype.reloadTarget = function (target, data) {
336
336
  var scoped = this.context;
337
337
  scoped.reload(target, data);
338
338
  };
339
- TableRenderer.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
339
+ TableV2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
340
340
  var _this = this;
341
341
  var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
342
342
  if (Array.isArray(rows)) {
@@ -389,7 +389,7 @@ var TableRenderer = /** @class */ (function (_super) {
389
389
  });
390
390
  }
391
391
  };
392
- TableRenderer.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, resetOnFailed) {
392
+ TableV2.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, resetOnFailed) {
393
393
  if (!(0, mobx_state_tree_1.isAlive)(item)) {
394
394
  return;
395
395
  }
@@ -412,7 +412,7 @@ var TableRenderer = /** @class */ (function (_super) {
412
412
  ? onSave(item.data, (0, helper_1.difference)(item.data, item.pristine, ['id', primaryField]), item.path, undefined, item.pristine, resetOnFailed)
413
413
  : this.handleSave(quickSaveItemApi ? item.data : [item.data], (0, helper_1.difference)(item.data, item.pristine, ['id', primaryField]), [item.path], undefined, item.pristine, resetOnFailed);
414
414
  };
415
- TableRenderer.prototype.handleColumnToggle = function (columns) {
415
+ TableV2.prototype.handleColumnToggle = function (columns) {
416
416
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
417
417
  var _a, dispatchEvent, data, store, rendererEvent;
418
418
  return (0, tslib_1.__generator)(this, function (_b) {
@@ -433,7 +433,7 @@ var TableRenderer = /** @class */ (function (_super) {
433
433
  });
434
434
  });
435
435
  };
436
- TableRenderer.prototype.renderColumnsToggler = function () {
436
+ TableV2.prototype.renderColumnsToggler = function () {
437
437
  var _a = this.props, className = _a.className, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, rest = (0, tslib_1.__rest)(_a, ["className", "store", "render", "classPrefix", "classnames"]);
438
438
  var __ = rest.translate;
439
439
  var env = rest.env;
@@ -448,15 +448,16 @@ var TableRenderer = /** @class */ (function (_super) {
448
448
  isActived: store.hasColumnHidden(),
449
449
  columns: store.columnsData,
450
450
  onColumnToggle: this.handleColumnToggle,
451
- children: children
451
+ children: children,
452
+ tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined
452
453
  });
453
454
  };
454
- TableRenderer.prototype.handleAction = function (e, action, ctx) {
455
+ TableV2.prototype.handleAction = function (e, action, ctx) {
455
456
  var onAction = this.props.onAction;
456
457
  // todo
457
458
  onAction(e, action, ctx);
458
459
  };
459
- TableRenderer.prototype.renderActions = function (region) {
460
+ TableV2.prototype.renderActions = function (region) {
460
461
  var _this = this;
461
462
  var _a = this.props, actions = _a.actions, render = _a.render, store = _a.store, cx = _a.classnames, data = _a.data;
462
463
  actions = Array.isArray(actions) ? actions.concat() : [];
@@ -477,7 +478,7 @@ var TableRenderer = /** @class */ (function (_super) {
477
478
  });
478
479
  }))) : null;
479
480
  };
480
- TableRenderer.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
481
+ TableV2.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
481
482
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
482
483
  var _a, dispatchEvent, data, rowSelection, onSelect, store, rendererEvent;
483
484
  return (0, tslib_1.__generator)(this, function (_b) {
@@ -500,7 +501,7 @@ var TableRenderer = /** @class */ (function (_super) {
500
501
  });
501
502
  });
502
503
  };
503
- TableRenderer.prototype.handleSort = function (payload) {
504
+ TableV2.prototype.handleSort = function (payload) {
504
505
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
505
506
  var _a, dispatchEvent, data, onSort, rendererEvent;
506
507
  return (0, tslib_1.__generator)(this, function (_b) {
@@ -522,7 +523,7 @@ var TableRenderer = /** @class */ (function (_super) {
522
523
  });
523
524
  });
524
525
  };
525
- TableRenderer.prototype.handleFilter = function (payload) {
526
+ TableV2.prototype.handleFilter = function (payload) {
526
527
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
527
528
  var _a, dispatchEvent, data, onFilter, rendererEvent;
528
529
  return (0, tslib_1.__generator)(this, function (_b) {
@@ -541,7 +542,7 @@ var TableRenderer = /** @class */ (function (_super) {
541
542
  });
542
543
  });
543
544
  };
544
- TableRenderer.prototype.handleRowClick = function (event, rowItem, rowIndex) {
545
+ TableV2.prototype.handleRowClick = function (event, rowItem, rowIndex) {
545
546
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
546
547
  var _a, dispatchEvent, data, onRow, rendererEvent;
547
548
  return (0, tslib_1.__generator)(this, function (_b) {
@@ -562,7 +563,7 @@ var TableRenderer = /** @class */ (function (_super) {
562
563
  });
563
564
  });
564
565
  };
565
- TableRenderer.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
566
+ TableV2.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
566
567
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
567
568
  var store, rowItem;
568
569
  return (0, tslib_1.__generator)(this, function (_a) {
@@ -573,7 +574,7 @@ var TableRenderer = /** @class */ (function (_super) {
573
574
  });
574
575
  });
575
576
  };
576
- TableRenderer.prototype.handleSaveOrder = function () {
577
+ TableV2.prototype.handleSaveOrder = function () {
577
578
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
578
579
  var _a, store, onSaveOrder, data, dispatchEvent, movedItems, items, rendererEvent;
579
580
  return (0, tslib_1.__generator)(this, function (_b) {
@@ -597,11 +598,11 @@ var TableRenderer = /** @class */ (function (_super) {
597
598
  });
598
599
  });
599
600
  };
600
- TableRenderer.prototype.reset = function () {
601
+ TableV2.prototype.reset = function () {
601
602
  var store = this.props.store;
602
603
  store.reset();
603
604
  };
604
- TableRenderer.prototype.doAction = function (action, args, throwErrors) {
605
+ TableV2.prototype.doAction = function (action, args, throwErrors) {
605
606
  var _a = this.props, store = _a.store, rowSelection = _a.rowSelection, data = _a.data;
606
607
  var actionType = action === null || action === void 0 ? void 0 : action.actionType;
607
608
  var keyField = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField;
@@ -616,7 +617,10 @@ var TableRenderer = /** @class */ (function (_super) {
616
617
  var dataSource = store.getData(data);
617
618
  var selected_1 = [];
618
619
  dataSource.items.forEach(function (item, rowIndex) {
619
- var flag = (0, tpl_1.evalExpression)(args === null || args === void 0 ? void 0 : args.selectedRowKeysExpr, { record: item, rowIndex: rowIndex });
620
+ var flag = (0, tpl_1.evalExpression)(args === null || args === void 0 ? void 0 : args.selectedRowKeysExpr, {
621
+ record: item,
622
+ rowIndex: rowIndex
623
+ });
620
624
  if (flag) {
621
625
  selected_1.push(item[keyField]);
622
626
  }
@@ -627,9 +631,9 @@ var TableRenderer = /** @class */ (function (_super) {
627
631
  break;
628
632
  }
629
633
  };
630
- TableRenderer.prototype.renderTable = function () {
634
+ TableV2.prototype.renderTable = function () {
631
635
  var _this = this;
632
- var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection, columns = _a.columns, expandable = _a.expandable, expandableBody = _a.expandableBody, footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = (0, tslib_1.__rest)(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "expandableBody", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
636
+ var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection, columns = _a.columns, expandable = _a.expandable, footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = (0, tslib_1.__rest)(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
633
637
  var expandableConfig = null;
634
638
  if (expandable) {
635
639
  var expandedRowKeys = expandable.expandedRowKeys, rest_1 = (0, tslib_1.__rest)(expandable, ["expandedRowKeys"]);
@@ -640,9 +644,9 @@ var TableRenderer = /** @class */ (function (_super) {
640
644
  };
641
645
  delete expandableConfig.expandableOn;
642
646
  }
643
- if (expandableBody && expandableBody.length > 0) {
647
+ if (expandable && expandable.type) {
644
648
  expandableConfig.expandedRowRender = function (record, rowIndex) {
645
- return _this.renderSchema('expandableBody', expandableBody, { data: record });
649
+ return _this.renderSchema('expandableBody', (0, tslib_1.__assign)({}, expandable), { data: record });
646
650
  };
647
651
  }
648
652
  if (expandable.expandedRowClassNameExpr) {
@@ -729,7 +733,7 @@ var TableRenderer = /** @class */ (function (_super) {
729
733
  }
730
734
  return (react_1.default.createElement(table_1.default, (0, tslib_1.__assign)({}, rest, { title: this.renderSchema('title', title, { data: this.props.data }), footer: this.renderSchema('footer', footer, { data: this.props.data }), columns: this.buildColumns(store.filteredColumns), dataSource: store.dataSource, rowSelection: rowSelectionConfig, rowClassName: rowClassName, expandable: expandableConfig, footSummary: this.buildSummary('footSummary', footSummary), headSummary: this.buildSummary('headSummary', headSummary), loading: this.renderSchema('loading', loading), placeholder: this.renderSchema('placeholder', placeholder), onSelect: this.handleSelected, onSelectAll: this.handleSelected, onSort: this.handleSort, onFilter: this.handleFilter, onDrag: this.handleOrderChange, itemActions: itemActionsConfig, onRow: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, onRow), { onRowClick: this.handleRowClick }) })));
731
735
  };
732
- TableRenderer.prototype.renderHeading = function () {
736
+ TableV2.prototype.renderHeading = function () {
733
737
  var _a = this.props, store = _a.store, cx = _a.classnames, headingClassName = _a.headingClassName, __ = _a.translate;
734
738
  if (store.moved) {
735
739
  return (react_1.default.createElement("div", { className: cx('Table-heading', headingClassName), key: "heading" }, store.moved ? (react_1.default.createElement("span", null,
@@ -745,7 +749,7 @@ var TableRenderer = /** @class */ (function (_super) {
745
749
  }
746
750
  return null;
747
751
  };
748
- TableRenderer.prototype.render = function () {
752
+ TableV2.prototype.render = function () {
749
753
  var cx = this.props.classnames;
750
754
  this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了
751
755
  var heading = this.renderHeading();
@@ -754,60 +758,85 @@ var TableRenderer = /** @class */ (function (_super) {
754
758
  heading,
755
759
  this.renderTable()));
756
760
  };
757
- var TableRenderer_1, _a, _b, _c, _d, _e, _f, _g;
758
- TableRenderer.contextType = Scoped_1.ScopedContext;
761
+ var _a, _b, _c, _d, _e, _f;
762
+ TableV2.contextType = Scoped_1.ScopedContext;
759
763
  (0, tslib_1.__decorate)([
760
764
  helper_1.autobind,
761
765
  (0, tslib_1.__metadata)("design:type", Function),
762
766
  (0, tslib_1.__metadata)("design:paramtypes", [typeof (_a = typeof Array !== "undefined" && Array) === "function" ? _a : Object, typeof (_b = typeof Array !== "undefined" && Array) === "function" ? _b : Object, typeof (_c = typeof Array !== "undefined" && Array) === "function" ? _c : Object]),
763
767
  (0, tslib_1.__metadata)("design:returntype", Promise)
764
- ], TableRenderer.prototype, "handleSelected", null);
768
+ ], TableV2.prototype, "handleSelected", null);
765
769
  (0, tslib_1.__decorate)([
766
770
  helper_1.autobind,
767
771
  (0, tslib_1.__metadata)("design:type", Function),
768
772
  (0, tslib_1.__metadata)("design:paramtypes", [typeof (_d = typeof table_1.SortProps !== "undefined" && table_1.SortProps) === "function" ? _d : Object]),
769
773
  (0, tslib_1.__metadata)("design:returntype", Promise)
770
- ], TableRenderer.prototype, "handleSort", null);
774
+ ], TableV2.prototype, "handleSort", null);
771
775
  (0, tslib_1.__decorate)([
772
776
  helper_1.autobind,
773
777
  (0, tslib_1.__metadata)("design:type", Function),
774
778
  (0, tslib_1.__metadata)("design:paramtypes", [Object]),
775
779
  (0, tslib_1.__metadata)("design:returntype", Promise)
776
- ], TableRenderer.prototype, "handleFilter", null);
780
+ ], TableV2.prototype, "handleFilter", null);
777
781
  (0, tslib_1.__decorate)([
778
782
  helper_1.autobind,
779
783
  (0, tslib_1.__metadata)("design:type", Function),
780
784
  (0, tslib_1.__metadata)("design:paramtypes", [typeof (_e = typeof react_1.default !== "undefined" && react_1.default.ChangeEvent) === "function" ? _e : Object, Object, Number]),
781
785
  (0, tslib_1.__metadata)("design:returntype", Promise)
782
- ], TableRenderer.prototype, "handleRowClick", null);
786
+ ], TableV2.prototype, "handleRowClick", null);
783
787
  (0, tslib_1.__decorate)([
784
788
  helper_1.autobind,
785
789
  (0, tslib_1.__metadata)("design:type", Function),
786
790
  (0, tslib_1.__metadata)("design:paramtypes", [Number, Number, typeof (_f = typeof Array !== "undefined" && Array) === "function" ? _f : Object]),
787
791
  (0, tslib_1.__metadata)("design:returntype", Promise)
788
- ], TableRenderer.prototype, "handleOrderChange", null);
792
+ ], TableV2.prototype, "handleOrderChange", null);
789
793
  (0, tslib_1.__decorate)([
790
794
  helper_1.autobind,
791
795
  (0, tslib_1.__metadata)("design:type", Function),
792
796
  (0, tslib_1.__metadata)("design:paramtypes", []),
793
797
  (0, tslib_1.__metadata)("design:returntype", Promise)
794
- ], TableRenderer.prototype, "handleSaveOrder", null);
798
+ ], TableV2.prototype, "handleSaveOrder", null);
795
799
  (0, tslib_1.__decorate)([
796
800
  helper_1.autobind,
797
801
  (0, tslib_1.__metadata)("design:type", Function),
798
802
  (0, tslib_1.__metadata)("design:paramtypes", []),
799
803
  (0, tslib_1.__metadata)("design:returntype", void 0)
800
- ], TableRenderer.prototype, "reset", null);
801
- TableRenderer = TableRenderer_1 = (0, tslib_1.__decorate)([
804
+ ], TableV2.prototype, "reset", null);
805
+ return TableV2;
806
+ }(react_1.default.Component));
807
+ exports.default = TableV2;
808
+ var TableRenderer = /** @class */ (function (_super) {
809
+ (0, tslib_1.__extends)(TableRenderer, _super);
810
+ function TableRenderer() {
811
+ return _super !== null && _super.apply(this, arguments) || this;
812
+ }
813
+ TableRenderer.prototype.receive = function (values, subPath) {
814
+ var _this = this;
815
+ var _a, _b;
816
+ var scoped = this.context;
817
+ var parents = (_a = scoped === null || scoped === void 0 ? void 0 : scoped.parent) === null || _a === void 0 ? void 0 : _a.getComponents();
818
+ /**
819
+ * 因为Table在scope上注册,导致getComponentByName查询组件时会优先找到Table,和CRUD联动的动作都会失效
820
+ * 这里先做兼容处理,把动作交给上层的CRUD处理
821
+ */
822
+ if (Array.isArray(parents) && parents.length) {
823
+ // CRUD的name会透传给Table,这样可以保证找到CRUD
824
+ var crud = parents.find(function (cmpt) { var _a, _b; return ((_a = cmpt === null || cmpt === void 0 ? void 0 : cmpt.props) === null || _a === void 0 ? void 0 : _a.name) === ((_b = _this.props) === null || _b === void 0 ? void 0 : _b.name); });
825
+ return (_b = crud === null || crud === void 0 ? void 0 : crud.receive) === null || _b === void 0 ? void 0 : _b.call(crud, values, subPath);
826
+ }
827
+ if (subPath) {
828
+ return scoped.send(subPath, values);
829
+ }
830
+ };
831
+ TableRenderer = (0, tslib_1.__decorate)([
802
832
  (0, factory_1.Renderer)({
803
833
  type: 'table-v2',
804
834
  storeType: table_v2_1.TableStoreV2.name,
805
835
  name: 'table-v2',
806
836
  isolateScope: true
807
- }),
808
- (0, tslib_1.__metadata)("design:paramtypes", [Object, typeof (_g = typeof Scoped_1.IScopedContext !== "undefined" && Scoped_1.IScopedContext) === "function" ? _g : Object])
837
+ })
809
838
  ], TableRenderer);
810
839
  return TableRenderer;
811
- }(react_1.default.Component));
812
- exports.default = TableRenderer;
840
+ }(TableV2));
841
+ exports.TableRenderer = TableRenderer;
813
842
  //# sourceMappingURL=./renderers/Table-v2/index.js.map