wargerm 0.7.65 → 0.7.67

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 +38 -15
  2. package/dist/index.js +38 -15
  3. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -7090,16 +7090,19 @@ 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
  }
7097
+ if (item.type === 'group') {
7098
+ var _item$children;
7099
+ item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.filter(function (itm) {
7100
+ if (itm.hiddenInModalForm || itm.hideInModalForm) {
7101
+ return false;
7102
+ }
7103
+ return true;
7104
+ });
7105
+ }
7103
7106
  if (item.onlyShowInView) {
7104
7107
  if (modalFormConfig.type === '查看') {
7105
7108
  return true;
@@ -7110,18 +7113,28 @@ var TabelCard = function TabelCard(props, ref) {
7110
7113
  return true;
7111
7114
  }).map(function (item) {
7112
7115
  var _item$renderColumn;
7116
+ if (item.type === 'group') {
7117
+ var _item$children2;
7118
+ item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.map(function (itm) {
7119
+ var _itm$renderColumn;
7120
+ 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;
7121
+ });
7122
+ }
7113
7123
  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
7124
  }),
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) {
7125
+ columns: (modalFormColumn || []).filter(function (item) {
7122
7126
  if (item.hiddenInModalForm || item.hideInModalForm) {
7123
7127
  return false;
7124
7128
  }
7129
+ if (item.type === 'group') {
7130
+ var _item$children3;
7131
+ item.children = (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.filter(function (itm) {
7132
+ if (itm.hiddenInModalForm || itm.hideInModalForm) {
7133
+ return false;
7134
+ }
7135
+ return true;
7136
+ });
7137
+ }
7125
7138
  if (item.onlyShowInView) {
7126
7139
  if (modalFormConfig.type === '查看') {
7127
7140
  return true;
@@ -7132,6 +7145,13 @@ var TabelCard = function TabelCard(props, ref) {
7132
7145
  return true;
7133
7146
  }).map(function (item) {
7134
7147
  var _item$renderColumn2;
7148
+ if (item.type === 'group') {
7149
+ var _item$children4;
7150
+ item.children = (_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.map(function (itm) {
7151
+ var _itm$renderColumn2;
7152
+ 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;
7153
+ });
7154
+ }
7135
7155
  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
7156
  })
7137
7157
  }))), search !== false && ( /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
@@ -7153,7 +7173,10 @@ var TabelCard = function TabelCard(props, ref) {
7153
7173
  } else {
7154
7174
  return [].concat(_toConsumableArray(pre), [column]);
7155
7175
  }
7156
- }, [])
7176
+ }, []).map(function (item) {
7177
+ var _item$renderColumn3;
7178
+ 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;
7179
+ })
7157
7180
  }, searchFormConfig || {}))), searchTableSlot && searchTableSlot, columns && columns.length && ( /*#__PURE__*/React.createElement(ProTable, _objectSpread2(_objectSpread2({
7158
7181
  actionRef: actionRef,
7159
7182
  rowKey: "id",
package/dist/index.js CHANGED
@@ -7134,16 +7134,19 @@ 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
  }
7141
+ if (item.type === 'group') {
7142
+ var _item$children;
7143
+ item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.filter(function (itm) {
7144
+ if (itm.hiddenInModalForm || itm.hideInModalForm) {
7145
+ return false;
7146
+ }
7147
+ return true;
7148
+ });
7149
+ }
7147
7150
  if (item.onlyShowInView) {
7148
7151
  if (modalFormConfig.type === '查看') {
7149
7152
  return true;
@@ -7154,18 +7157,28 @@ var TabelCard = function TabelCard(props, ref) {
7154
7157
  return true;
7155
7158
  }).map(function (item) {
7156
7159
  var _item$renderColumn;
7160
+ if (item.type === 'group') {
7161
+ var _item$children2;
7162
+ item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.map(function (itm) {
7163
+ var _itm$renderColumn;
7164
+ 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;
7165
+ });
7166
+ }
7157
7167
  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
7168
  }),
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) {
7169
+ columns: (modalFormColumn || []).filter(function (item) {
7166
7170
  if (item.hiddenInModalForm || item.hideInModalForm) {
7167
7171
  return false;
7168
7172
  }
7173
+ if (item.type === 'group') {
7174
+ var _item$children3;
7175
+ item.children = (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.filter(function (itm) {
7176
+ if (itm.hiddenInModalForm || itm.hideInModalForm) {
7177
+ return false;
7178
+ }
7179
+ return true;
7180
+ });
7181
+ }
7169
7182
  if (item.onlyShowInView) {
7170
7183
  if (modalFormConfig.type === '查看') {
7171
7184
  return true;
@@ -7176,6 +7189,13 @@ var TabelCard = function TabelCard(props, ref) {
7176
7189
  return true;
7177
7190
  }).map(function (item) {
7178
7191
  var _item$renderColumn2;
7192
+ if (item.type === 'group') {
7193
+ var _item$children4;
7194
+ item.children = (_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.map(function (itm) {
7195
+ var _itm$renderColumn2;
7196
+ 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;
7197
+ });
7198
+ }
7179
7199
  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
7200
  })
7181
7201
  }))), search !== false && ( /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
@@ -7197,7 +7217,10 @@ var TabelCard = function TabelCard(props, ref) {
7197
7217
  } else {
7198
7218
  return [].concat(_toConsumableArray(pre), [column]);
7199
7219
  }
7200
- }, [])
7220
+ }, []).map(function (item) {
7221
+ var _item$renderColumn3;
7222
+ 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;
7223
+ })
7201
7224
  }, searchFormConfig || {}))), searchTableSlot && searchTableSlot, columns && columns.length && ( /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
7202
7225
  actionRef: actionRef,
7203
7226
  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.67",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",