wargerm 0.7.65 → 0.7.66

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 (3) hide show
  1. package/dist/index.esm.js +20 -15
  2. package/dist/index.js +20 -15
  3. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -7090,13 +7090,7 @@ var TabelCard = function TabelCard(props, ref) {
7090
7090
  }, modalFormSearch)
7091
7091
  }, modalConfig), {}, {
7092
7092
  onFormChange: onFormChange,
7093
- extraColumns: (extraColumns || []).reduce(function (pre, column) {
7094
- if (column.type == 'group') {
7095
- return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
7096
- } else {
7097
- return [].concat(_toConsumableArray(pre), [column]);
7098
- }
7099
- }, []).filter(function (item) {
7093
+ extraColumns: (extraColumns || []).filter(function (item) {
7100
7094
  if (item.hiddenInModalForm || item.hideInModalForm) {
7101
7095
  return false;
7102
7096
  }
@@ -7110,15 +7104,16 @@ var TabelCard = function TabelCard(props, ref) {
7110
7104
  return true;
7111
7105
  }).map(function (item) {
7112
7106
  var _item$renderColumn;
7107
+ if (item.type === 'group') {
7108
+ var _item$children;
7109
+ item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.map(function (itm) {
7110
+ var _itm$renderColumn;
7111
+ return (itm === null || itm === void 0 ? void 0 : (_itm$renderColumn = itm.renderColumn) === null || _itm$renderColumn === void 0 ? void 0 : _itm$renderColumn.call(itm, itm, modalFormConfig)) || itm;
7112
+ });
7113
+ }
7113
7114
  return (item === null || item === void 0 ? void 0 : (_item$renderColumn = item.renderColumn) === null || _item$renderColumn === void 0 ? void 0 : _item$renderColumn.call(item, item, modalFormConfig)) || item;
7114
7115
  }),
7115
- columns: (modalFormColumn || []).reduce(function (pre, column) {
7116
- if (column.type == 'group') {
7117
- return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
7118
- } else {
7119
- return [].concat(_toConsumableArray(pre), [column]);
7120
- }
7121
- }, []).filter(function (item) {
7116
+ columns: (modalFormColumn || []).filter(function (item) {
7122
7117
  if (item.hiddenInModalForm || item.hideInModalForm) {
7123
7118
  return false;
7124
7119
  }
@@ -7132,6 +7127,13 @@ var TabelCard = function TabelCard(props, ref) {
7132
7127
  return true;
7133
7128
  }).map(function (item) {
7134
7129
  var _item$renderColumn2;
7130
+ if (item.type === 'group') {
7131
+ var _item$children2;
7132
+ item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.map(function (itm) {
7133
+ var _itm$renderColumn2;
7134
+ return (itm === null || itm === void 0 ? void 0 : (_itm$renderColumn2 = itm.renderColumn) === null || _itm$renderColumn2 === void 0 ? void 0 : _itm$renderColumn2.call(itm, itm, modalFormConfig)) || itm;
7135
+ });
7136
+ }
7135
7137
  return (item === null || item === void 0 ? void 0 : (_item$renderColumn2 = item.renderColumn) === null || _item$renderColumn2 === void 0 ? void 0 : _item$renderColumn2.call(item, item, modalFormConfig)) || item;
7136
7138
  })
7137
7139
  }))), search !== false && ( /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
@@ -7153,7 +7155,10 @@ var TabelCard = function TabelCard(props, ref) {
7153
7155
  } else {
7154
7156
  return [].concat(_toConsumableArray(pre), [column]);
7155
7157
  }
7156
- }, [])
7158
+ }, []).map(function (item) {
7159
+ var _item$renderColumn3;
7160
+ return (item === null || item === void 0 ? void 0 : (_item$renderColumn3 = item.renderColumn) === null || _item$renderColumn3 === void 0 ? void 0 : _item$renderColumn3.call(item, item, modalFormConfig)) || item;
7161
+ })
7157
7162
  }, searchFormConfig || {}))), searchTableSlot && searchTableSlot, columns && columns.length && ( /*#__PURE__*/React.createElement(ProTable, _objectSpread2(_objectSpread2({
7158
7163
  actionRef: actionRef,
7159
7164
  rowKey: "id",
package/dist/index.js CHANGED
@@ -7134,13 +7134,7 @@ var TabelCard = function TabelCard(props, ref) {
7134
7134
  }, modalFormSearch)
7135
7135
  }, modalConfig), {}, {
7136
7136
  onFormChange: onFormChange,
7137
- extraColumns: (extraColumns || []).reduce(function (pre, column) {
7138
- if (column.type == 'group') {
7139
- return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
7140
- } else {
7141
- return [].concat(_toConsumableArray(pre), [column]);
7142
- }
7143
- }, []).filter(function (item) {
7137
+ extraColumns: (extraColumns || []).filter(function (item) {
7144
7138
  if (item.hiddenInModalForm || item.hideInModalForm) {
7145
7139
  return false;
7146
7140
  }
@@ -7154,15 +7148,16 @@ var TabelCard = function TabelCard(props, ref) {
7154
7148
  return true;
7155
7149
  }).map(function (item) {
7156
7150
  var _item$renderColumn;
7151
+ if (item.type === 'group') {
7152
+ var _item$children;
7153
+ item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.map(function (itm) {
7154
+ var _itm$renderColumn;
7155
+ return (itm === null || itm === void 0 ? void 0 : (_itm$renderColumn = itm.renderColumn) === null || _itm$renderColumn === void 0 ? void 0 : _itm$renderColumn.call(itm, itm, modalFormConfig)) || itm;
7156
+ });
7157
+ }
7157
7158
  return (item === null || item === void 0 ? void 0 : (_item$renderColumn = item.renderColumn) === null || _item$renderColumn === void 0 ? void 0 : _item$renderColumn.call(item, item, modalFormConfig)) || item;
7158
7159
  }),
7159
- columns: (modalFormColumn || []).reduce(function (pre, column) {
7160
- if (column.type == 'group') {
7161
- return [].concat(_toConsumableArray(pre), _toConsumableArray(column.children));
7162
- } else {
7163
- return [].concat(_toConsumableArray(pre), [column]);
7164
- }
7165
- }, []).filter(function (item) {
7160
+ columns: (modalFormColumn || []).filter(function (item) {
7166
7161
  if (item.hiddenInModalForm || item.hideInModalForm) {
7167
7162
  return false;
7168
7163
  }
@@ -7176,6 +7171,13 @@ var TabelCard = function TabelCard(props, ref) {
7176
7171
  return true;
7177
7172
  }).map(function (item) {
7178
7173
  var _item$renderColumn2;
7174
+ if (item.type === 'group') {
7175
+ var _item$children2;
7176
+ item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.map(function (itm) {
7177
+ var _itm$renderColumn2;
7178
+ return (itm === null || itm === void 0 ? void 0 : (_itm$renderColumn2 = itm.renderColumn) === null || _itm$renderColumn2 === void 0 ? void 0 : _itm$renderColumn2.call(itm, itm, modalFormConfig)) || itm;
7179
+ });
7180
+ }
7179
7181
  return (item === null || item === void 0 ? void 0 : (_item$renderColumn2 = item.renderColumn) === null || _item$renderColumn2 === void 0 ? void 0 : _item$renderColumn2.call(item, item, modalFormConfig)) || item;
7180
7182
  })
7181
7183
  }))), search !== false && ( /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
@@ -7197,7 +7199,10 @@ var TabelCard = function TabelCard(props, ref) {
7197
7199
  } else {
7198
7200
  return [].concat(_toConsumableArray(pre), [column]);
7199
7201
  }
7200
- }, [])
7202
+ }, []).map(function (item) {
7203
+ var _item$renderColumn3;
7204
+ return (item === null || item === void 0 ? void 0 : (_item$renderColumn3 = item.renderColumn) === null || _item$renderColumn3 === void 0 ? void 0 : _item$renderColumn3.call(item, item, modalFormConfig)) || item;
7205
+ })
7201
7206
  }, searchFormConfig || {}))), searchTableSlot && searchTableSlot, columns && columns.length && ( /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
7202
7207
  actionRef: actionRef,
7203
7208
  rowKey: "id",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.7.65",
4
+ "version": "0.7.66",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",