wargerm 0.7.63 → 0.7.65

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.
package/dist/index.esm.js CHANGED
@@ -7090,8 +7090,14 @@ var TabelCard = function TabelCard(props, ref) {
7090
7090
  }, modalFormSearch)
7091
7091
  }, modalConfig), {}, {
7092
7092
  onFormChange: onFormChange,
7093
- extraColumns: (extraColumns || []).filter(function (item) {
7094
- if (item.hiddenInModalForm) {
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) {
7100
+ if (item.hiddenInModalForm || item.hideInModalForm) {
7095
7101
  return false;
7096
7102
  }
7097
7103
  if (item.onlyShowInView) {
@@ -7102,9 +7108,18 @@ var TabelCard = function TabelCard(props, ref) {
7102
7108
  }
7103
7109
  }
7104
7110
  return true;
7111
+ }).map(function (item) {
7112
+ var _item$renderColumn;
7113
+ 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;
7105
7114
  }),
7106
- columns: (modalFormColumn || []).filter(function (item) {
7107
- if (item.hiddenInModalForm) {
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) {
7122
+ if (item.hiddenInModalForm || item.hideInModalForm) {
7108
7123
  return false;
7109
7124
  }
7110
7125
  if (item.onlyShowInView) {
@@ -7116,8 +7131,8 @@ var TabelCard = function TabelCard(props, ref) {
7116
7131
  }
7117
7132
  return true;
7118
7133
  }).map(function (item) {
7119
- var _item$renderColumn;
7120
- 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;
7134
+ var _item$renderColumn2;
7135
+ 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;
7121
7136
  })
7122
7137
  }))), search !== false && ( /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
7123
7138
  ref: searchFormRef,
@@ -7176,6 +7191,7 @@ var TabelCard = function TabelCard(props, ref) {
7176
7191
  align: 'center',
7177
7192
  hideInSearch: true,
7178
7193
  hiddenInModalForm: true,
7194
+ hideInModalForm: true,
7179
7195
  width: 60,
7180
7196
  render: function render(text, record, index) {
7181
7197
  return index + 1;
package/dist/index.js CHANGED
@@ -7134,8 +7134,14 @@ var TabelCard = function TabelCard(props, ref) {
7134
7134
  }, modalFormSearch)
7135
7135
  }, modalConfig), {}, {
7136
7136
  onFormChange: onFormChange,
7137
- extraColumns: (extraColumns || []).filter(function (item) {
7138
- if (item.hiddenInModalForm) {
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) {
7144
+ if (item.hiddenInModalForm || item.hideInModalForm) {
7139
7145
  return false;
7140
7146
  }
7141
7147
  if (item.onlyShowInView) {
@@ -7146,9 +7152,18 @@ var TabelCard = function TabelCard(props, ref) {
7146
7152
  }
7147
7153
  }
7148
7154
  return true;
7155
+ }).map(function (item) {
7156
+ var _item$renderColumn;
7157
+ 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;
7149
7158
  }),
7150
- columns: (modalFormColumn || []).filter(function (item) {
7151
- if (item.hiddenInModalForm) {
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) {
7166
+ if (item.hiddenInModalForm || item.hideInModalForm) {
7152
7167
  return false;
7153
7168
  }
7154
7169
  if (item.onlyShowInView) {
@@ -7160,8 +7175,8 @@ var TabelCard = function TabelCard(props, ref) {
7160
7175
  }
7161
7176
  return true;
7162
7177
  }).map(function (item) {
7163
- var _item$renderColumn;
7164
- 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;
7178
+ var _item$renderColumn2;
7179
+ 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;
7165
7180
  })
7166
7181
  }))), search !== false && ( /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
7167
7182
  ref: searchFormRef,
@@ -7220,6 +7235,7 @@ var TabelCard = function TabelCard(props, ref) {
7220
7235
  align: 'center',
7221
7236
  hideInSearch: true,
7222
7237
  hiddenInModalForm: true,
7238
+ hideInModalForm: true,
7223
7239
  width: 60,
7224
7240
  render: function render(text, record, index) {
7225
7241
  return index + 1;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.7.63",
4
+ "version": "0.7.65",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",