wargerm 0.7.68 → 0.7.70

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 +44 -24
  2. package/dist/index.js +44 -24
  3. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -3467,11 +3467,31 @@ var WForm = function WForm(props, ref) {
3467
3467
  columnsFields = _useState4[0],
3468
3468
  setColumnsFields = _useState4[1];
3469
3469
  var filterFormColumns = deepCopy(columns).filter(function (c) {
3470
+ if (c.type == 'group') {
3471
+ var _c$children;
3472
+ c.children = (_c$children = c.children) === null || _c$children === void 0 ? void 0 : _c$children.filter(function (itm) {
3473
+ if (disabledHideInSearch) return true;
3474
+ if (itm.hideInSearch || itm.disabledHideInSearch) {
3475
+ return false;
3476
+ }
3477
+ return true;
3478
+ });
3479
+ }
3470
3480
  return !c.hideInSearch || disabledHideInSearch;
3471
3481
  }).sort(function (a, b) {
3472
3482
  return (b.order || 0) - (a.order || 0);
3473
3483
  });
3474
3484
  var filterExtraFormColumns = deepCopy(extraColumns || []).filter(function (c) {
3485
+ if (c.type == 'group') {
3486
+ var _c$children2;
3487
+ c.children = (_c$children2 = c.children) === null || _c$children2 === void 0 ? void 0 : _c$children2.filter(function (itm) {
3488
+ if (disabledHideInSearch) return true;
3489
+ if (itm.hideInSearch || itm.disabledHideInSearch) {
3490
+ return false;
3491
+ }
3492
+ return true;
3493
+ });
3494
+ }
3475
3495
  return !c.hideInSearch || disabledHideInSearch;
3476
3496
  }).sort(function (a, b) {
3477
3497
  return (b.order || 0) - (a.order || 0);
@@ -7224,13 +7244,23 @@ var TabelCard = function TabelCard(props, ref) {
7224
7244
  }, modalFormSearch)
7225
7245
  }, modalConfig), {}, {
7226
7246
  onFormChange: onFormChange,
7227
- extraColumns: (extraColumns || []).filter(function (item) {
7247
+ extraColumns: (extraColumns || []).map(function (item) {
7248
+ var _item$renderColumn;
7249
+ if (item.type === 'group') {
7250
+ var _item$children;
7251
+ item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.map(function (itm) {
7252
+ var _itm$renderColumn;
7253
+ 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;
7254
+ });
7255
+ }
7256
+ 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;
7257
+ }).filter(function (item) {
7228
7258
  if (item.hiddenInModalForm || item.hideInModalForm) {
7229
7259
  return false;
7230
7260
  }
7231
7261
  if (item.type === 'group') {
7232
- var _item$children;
7233
- item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.filter(function (itm) {
7262
+ var _item$children2;
7263
+ item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.filter(function (itm) {
7234
7264
  if (itm.hiddenInModalForm || itm.hideInModalForm) {
7235
7265
  return false;
7236
7266
  }
@@ -7245,24 +7275,24 @@ var TabelCard = function TabelCard(props, ref) {
7245
7275
  }
7246
7276
  }
7247
7277
  return true;
7248
- }).map(function (item) {
7249
- var _item$renderColumn;
7278
+ }),
7279
+ columns: (modalFormColumn || []).map(function (item) {
7280
+ var _item$renderColumn2;
7250
7281
  if (item.type === 'group') {
7251
- var _item$children2;
7252
- item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.map(function (itm) {
7253
- var _itm$renderColumn;
7254
- 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;
7282
+ var _item$children3;
7283
+ item.children = (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.map(function (itm) {
7284
+ var _itm$renderColumn2;
7285
+ 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;
7255
7286
  });
7256
7287
  }
7257
- 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;
7258
- }),
7259
- columns: (modalFormColumn || []).filter(function (item) {
7288
+ 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;
7289
+ }).filter(function (item) {
7260
7290
  if (item.hiddenInModalForm || item.hideInModalForm) {
7261
7291
  return false;
7262
7292
  }
7263
7293
  if (item.type === 'group') {
7264
- var _item$children3;
7265
- item.children = (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.filter(function (itm) {
7294
+ var _item$children4;
7295
+ item.children = (_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.filter(function (itm) {
7266
7296
  if (itm.hiddenInModalForm || itm.hideInModalForm) {
7267
7297
  return false;
7268
7298
  }
@@ -7277,16 +7307,6 @@ var TabelCard = function TabelCard(props, ref) {
7277
7307
  }
7278
7308
  }
7279
7309
  return true;
7280
- }).map(function (item) {
7281
- var _item$renderColumn2;
7282
- if (item.type === 'group') {
7283
- var _item$children4;
7284
- item.children = (_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.map(function (itm) {
7285
- var _itm$renderColumn2;
7286
- 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;
7287
- });
7288
- }
7289
- 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;
7290
7310
  })
7291
7311
  }))), search !== false && ( /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
7292
7312
  ref: searchFormRef,
package/dist/index.js CHANGED
@@ -3511,11 +3511,31 @@ var WForm = function WForm(props, ref) {
3511
3511
  columnsFields = _useState4[0],
3512
3512
  setColumnsFields = _useState4[1];
3513
3513
  var filterFormColumns = deepCopy(columns).filter(function (c) {
3514
+ if (c.type == 'group') {
3515
+ var _c$children;
3516
+ c.children = (_c$children = c.children) === null || _c$children === void 0 ? void 0 : _c$children.filter(function (itm) {
3517
+ if (disabledHideInSearch) return true;
3518
+ if (itm.hideInSearch || itm.disabledHideInSearch) {
3519
+ return false;
3520
+ }
3521
+ return true;
3522
+ });
3523
+ }
3514
3524
  return !c.hideInSearch || disabledHideInSearch;
3515
3525
  }).sort(function (a, b) {
3516
3526
  return (b.order || 0) - (a.order || 0);
3517
3527
  });
3518
3528
  var filterExtraFormColumns = deepCopy(extraColumns || []).filter(function (c) {
3529
+ if (c.type == 'group') {
3530
+ var _c$children2;
3531
+ c.children = (_c$children2 = c.children) === null || _c$children2 === void 0 ? void 0 : _c$children2.filter(function (itm) {
3532
+ if (disabledHideInSearch) return true;
3533
+ if (itm.hideInSearch || itm.disabledHideInSearch) {
3534
+ return false;
3535
+ }
3536
+ return true;
3537
+ });
3538
+ }
3519
3539
  return !c.hideInSearch || disabledHideInSearch;
3520
3540
  }).sort(function (a, b) {
3521
3541
  return (b.order || 0) - (a.order || 0);
@@ -7268,13 +7288,23 @@ var TabelCard = function TabelCard(props, ref) {
7268
7288
  }, modalFormSearch)
7269
7289
  }, modalConfig), {}, {
7270
7290
  onFormChange: onFormChange,
7271
- extraColumns: (extraColumns || []).filter(function (item) {
7291
+ extraColumns: (extraColumns || []).map(function (item) {
7292
+ var _item$renderColumn;
7293
+ if (item.type === 'group') {
7294
+ var _item$children;
7295
+ item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.map(function (itm) {
7296
+ var _itm$renderColumn;
7297
+ 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;
7298
+ });
7299
+ }
7300
+ 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;
7301
+ }).filter(function (item) {
7272
7302
  if (item.hiddenInModalForm || item.hideInModalForm) {
7273
7303
  return false;
7274
7304
  }
7275
7305
  if (item.type === 'group') {
7276
- var _item$children;
7277
- item.children = (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.filter(function (itm) {
7306
+ var _item$children2;
7307
+ item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.filter(function (itm) {
7278
7308
  if (itm.hiddenInModalForm || itm.hideInModalForm) {
7279
7309
  return false;
7280
7310
  }
@@ -7289,24 +7319,24 @@ var TabelCard = function TabelCard(props, ref) {
7289
7319
  }
7290
7320
  }
7291
7321
  return true;
7292
- }).map(function (item) {
7293
- var _item$renderColumn;
7322
+ }),
7323
+ columns: (modalFormColumn || []).map(function (item) {
7324
+ var _item$renderColumn2;
7294
7325
  if (item.type === 'group') {
7295
- var _item$children2;
7296
- item.children = (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.map(function (itm) {
7297
- var _itm$renderColumn;
7298
- 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;
7326
+ var _item$children3;
7327
+ item.children = (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.map(function (itm) {
7328
+ var _itm$renderColumn2;
7329
+ 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;
7299
7330
  });
7300
7331
  }
7301
- 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;
7302
- }),
7303
- columns: (modalFormColumn || []).filter(function (item) {
7332
+ 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;
7333
+ }).filter(function (item) {
7304
7334
  if (item.hiddenInModalForm || item.hideInModalForm) {
7305
7335
  return false;
7306
7336
  }
7307
7337
  if (item.type === 'group') {
7308
- var _item$children3;
7309
- item.children = (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.filter(function (itm) {
7338
+ var _item$children4;
7339
+ item.children = (_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.filter(function (itm) {
7310
7340
  if (itm.hiddenInModalForm || itm.hideInModalForm) {
7311
7341
  return false;
7312
7342
  }
@@ -7321,16 +7351,6 @@ var TabelCard = function TabelCard(props, ref) {
7321
7351
  }
7322
7352
  }
7323
7353
  return true;
7324
- }).map(function (item) {
7325
- var _item$renderColumn2;
7326
- if (item.type === 'group') {
7327
- var _item$children4;
7328
- item.children = (_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.map(function (itm) {
7329
- var _itm$renderColumn2;
7330
- 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;
7331
- });
7332
- }
7333
- 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;
7334
7354
  })
7335
7355
  }))), search !== false && ( /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
7336
7356
  ref: searchFormRef,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.7.68",
4
+ "version": "0.7.70",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",