@tachybase/client 1.1.2 → 1.1.8

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 (8) hide show
  1. package/es/block-provider/hooks/index.d.ts +1 -0
  2. package/es/block-provider/hooks/index.mjs +29 -5
  3. package/es/modules/blocks/data-blocks/table/hooks/useTableBlockProps.mjs +16 -5
  4. package/es/schema-component/antd/form-item/FormItem.mjs +13 -5
  5. package/lib/block-provider/hooks/index.js +246 -211
  6. package/lib/modules/blocks/data-blocks/table/hooks/useTableBlockProps.js +17 -5
  7. package/lib/schema-component/antd/form-item/FormItem.js +13 -5
  8. package/package.json +8 -8
package/es/block-provider/hooks/index.d.ts CHANGED
@@ -3,6 +3,7 @@ export * from './useFormActiveFields';
3
3
  export * from './useParsedFilter';
4
4
  export * from './useDataBlockSourceId';
5
5
  export * from './useIsMobile';
6
+ export declare function filterByCleanedFields(mergeFilter: any): unknown;
6
7
  export declare function getFormValues({ filterByTk, field, form, fieldNames, getField, resource, actionFields, }: {
7
8
  filterByTk: any;
8
9
  field: any;
package/es/block-provider/hooks/index.mjs CHANGED
@@ -2,6 +2,7 @@ import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
2
2
  import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema__ from "@tachybase/schema";
3
3
  import * as __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__ from "@tachybase/utils/client";
4
4
  import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
5
+ import * as __WEBPACK_EXTERNAL_MODULE_flat__ from "flat";
5
6
  import * as __WEBPACK_EXTERNAL_MODULE_lodash__ from "lodash";
6
7
  import * as __WEBPACK_EXTERNAL_MODULE_lodash_get__ from "lodash/get";
7
8
  import * as __WEBPACK_EXTERNAL_MODULE_lodash_omit__ from "lodash/omit";
@@ -34,6 +35,27 @@ function renderTemplate(str, data) {
34
35
  return (0, __WEBPACK_EXTERNAL_MODULE_lodash_get__["default"])(data, key) || '';
35
36
  });
36
37
  }
38
+ function filterByCleanedFields(mergeFilter) {
39
+ const items = (0, __WEBPACK_EXTERNAL_MODULE_flat__["default"])(mergeFilter);
40
+ const result = {};
41
+ const seen = new Set();
42
+ for(const key in items){
43
+ const value = items[key];
44
+ if (void 0 === value) continue;
45
+ const pathParts = key.split('.');
46
+ const filteredParts = pathParts.filter((p)=>!/^\d+$/.test(p) && ![
47
+ '$and',
48
+ '$or'
49
+ ].includes(p));
50
+ const fieldPath = filteredParts.join('.');
51
+ const uniqueKey = "".concat(fieldPath, "|").concat(JSON.stringify(value));
52
+ if (!seen.has(uniqueKey)) {
53
+ seen.add(uniqueKey);
54
+ result[key] = value;
55
+ }
56
+ }
57
+ return __WEBPACK_EXTERNAL_MODULE_flat__["default"].unflatten(result);
58
+ }
37
59
  function getFormValues(param) {
38
60
  let { filterByTk, field, form, fieldNames, getField, resource, actionFields } = param;
39
61
  if (filterByTk) {
@@ -429,12 +451,13 @@ const useFilterBlockActionProps = ()=>{
429
451
  filter.customFilter,
430
452
  prevMergedFilter
431
453
  ]);
432
- prevMergedFilter = mergedFilter;
433
- if ('manual' === block.dataLoadingMode && __WEBPACK_EXTERNAL_MODULE_lodash__["default"].isEmpty(mergedFilter)) return block.clearData();
454
+ const currFilter = filterByCleanedFields(mergedFilter);
455
+ prevMergedFilter = currFilter;
456
+ if ('manual' === block.dataLoadingMode && __WEBPACK_EXTERNAL_MODULE_lodash__["default"].isEmpty(currFilter)) return block.clearData();
434
457
  return block.doFilter({
435
458
  ...param,
436
459
  page: 1,
437
- filter: mergedFilter
460
+ filter: currFilter
438
461
  }, {
439
462
  filters: storedFilter
440
463
  });
@@ -467,11 +490,12 @@ const useResetBlockActionProps = ()=>{
467
490
  const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
468
491
  const storedFilter = (null === (_block_service_params1 = block.service.params) || void 0 === _block_service_params1 ? void 0 : null === (_block_service_params_ = _block_service_params1[1]) || void 0 === _block_service_params_ ? void 0 : _block_service_params_.filters) || {};
469
492
  delete storedFilter[uid];
470
- const mergedFilter = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
493
+ const currFilter = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
471
494
  ...Object.values(storedFilter),
472
495
  block.defaultFilter,
473
496
  prevMergedFilter
474
497
  ]);
498
+ const mergedFilter = filterByCleanedFields(currFilter);
475
499
  prevMergedFilter = mergedFilter;
476
500
  return block.doFilter({
477
501
  ...param,
@@ -1229,4 +1253,4 @@ async function resetFormCorrectly(form) {
1229
1253
  });
1230
1254
  await form.reset();
1231
1255
  }
1232
- export { findFilterTargets, getAfterWorkflows, getAssociationPath, getBeforeWorkflows, getFormValues, updateFilterTargets, useAssociationCreateActionProps, useAssociationFilterBlockProps, useAssociationFilterProps, useAssociationNames, useBulkDestroyActionProps, useCancelActionProps, useCollectValuesToSubmit, useCreateActionProps, useCustomizeRequestActionProps, useCustomizeUpdateActionProps, useDestroyActionProps, useDetailPrintActionProps, useDetailsPaginationProps, useDisassociateActionProps, useFilterBlockActionProps, useInsertSchema, useOptionalFieldList, useRefreshActionProps, useRemoveActionProps, useResetBlockActionProps, useUpdateActionProps };
1256
+ export { filterByCleanedFields, findFilterTargets, getAfterWorkflows, getAssociationPath, getBeforeWorkflows, getFormValues, updateFilterTargets, useAssociationCreateActionProps, useAssociationFilterBlockProps, useAssociationFilterProps, useAssociationNames, useBulkDestroyActionProps, useCancelActionProps, useCollectValuesToSubmit, useCreateActionProps, useCustomizeRequestActionProps, useCustomizeUpdateActionProps, useDestroyActionProps, useDetailPrintActionProps, useDetailsPaginationProps, useDisassociateActionProps, useFilterBlockActionProps, useInsertSchema, useOptionalFieldList, useRefreshActionProps, useRemoveActionProps, useResetBlockActionProps, useUpdateActionProps };
package/es/modules/blocks/data-blocks/table/hooks/useTableBlockProps.mjs CHANGED
@@ -1,5 +1,6 @@
1
1
  import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
2
2
  import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema__ from "@tachybase/schema";
3
+ import * as __WEBPACK_EXTERNAL_MODULE_flat__ from "flat";
3
4
  import * as __WEBPACK_EXTERNAL_MODULE_lodash__ from "lodash";
4
5
  import * as __WEBPACK_EXTERNAL_MODULE__block_provider_hooks_index_mjs__ from "../../../../../block-provider/hooks/index.mjs";
5
6
  import * as __WEBPACK_EXTERNAL_MODULE__block_provider_TableBlockProvider_mjs__ from "../../../../../block-provider/TableBlockProvider.mjs";
@@ -96,8 +97,9 @@ const useTableBlockProps = ()=>{
96
97
  const value = [
97
98
  record[ctx.rowKey]
98
99
  ];
100
+ let prevMergedFilter = {};
99
101
  dataBlocks.forEach((block)=>{
100
- var _block_service_params, _block_service_params_, _block_service_params1;
102
+ var _block_service_params, _block_service_params_, _block_service_params1, _block_service_params_1, _block_service_params2, _block_service;
101
103
  const target = targets.find((target)=>target.uid === block.uid);
102
104
  if (!target) return;
103
105
  const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
@@ -108,20 +110,29 @@ const useTableBlockProps = ()=>{
108
110
  } else storedFilter[uid] = {
109
111
  $and: [
110
112
  {
111
- [target.field || ctx.rowKey]: {
112
- [target.field ? '$in' : '$eq']: value
113
+ [(null == target ? void 0 : target.field) || ctx.rowKey]: {
114
+ [(null == target ? void 0 : target.field) ? '$in' : '$eq']: value
113
115
  }
114
116
  }
115
117
  ]
116
118
  };
119
+ const items = (0, __WEBPACK_EXTERNAL_MODULE_flat__["default"])((null === (_block_service = block.service) || void 0 === _block_service ? void 0 : null === (_block_service_params2 = _block_service.params) || void 0 === _block_service_params2 ? void 0 : null === (_block_service_params_1 = _block_service_params2[0]) || void 0 === _block_service_params_1 ? void 0 : _block_service_params_1.filter) || {});
120
+ Object.entries(items).forEach((param)=>{
121
+ let [key, value] = param;
122
+ if (key.includes(ctx.rowKey) && selectedRow.includes(value)) delete items[key];
123
+ });
117
124
  const mergedFilter = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
118
125
  ...Object.values(storedFilter).map((filter)=>(0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.removeNullCondition)(filter)),
119
- block.defaultFilter
126
+ __WEBPACK_EXTERNAL_MODULE_flat__["default"].unflatten(items),
127
+ block.defaultFilter,
128
+ prevMergedFilter
120
129
  ]);
130
+ const currFilter = (0, __WEBPACK_EXTERNAL_MODULE__block_provider_hooks_index_mjs__.filterByCleanedFields)(mergedFilter);
131
+ prevMergedFilter = currFilter;
121
132
  return block.doFilter({
122
133
  ...param,
123
134
  page: 1,
124
- filter: mergedFilter
135
+ filter: currFilter
125
136
  }, {
126
137
  filters: storedFilter
127
138
  });
package/es/schema-component/antd/form-item/FormItem.mjs CHANGED
@@ -87,11 +87,19 @@ const FormItem = (props)=>{
87
87
  ]);
88
88
  var _schema_xdecoratorprops_showTitle;
89
89
  const showTitle = null === (_schema_xdecoratorprops_showTitle = null === (_schema_xdecoratorprops = schema['x-decorator-props']) || void 0 === _schema_xdecoratorprops ? void 0 : _schema_xdecoratorprops.showTitle) || void 0 === _schema_xdecoratorprops_showTitle || _schema_xdecoratorprops_showTitle;
90
- const extra = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>'string' == typeof field.description ? /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("div", {
91
- dangerouslySetInnerHTML: {
92
- __html: (0, __WEBPACK_EXTERNAL_MODULE__input_shared_mjs__.HTMLEncode)(field.description).split('\n').join('<br/>')
93
- }
94
- }) : field.description, [
90
+ const extra = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>{
91
+ if ('string' == typeof field.description) {
92
+ const desc = field.description.trim();
93
+ if (!desc) return;
94
+ return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("div", {
95
+ dangerouslySetInnerHTML: {
96
+ __html: (0, __WEBPACK_EXTERNAL_MODULE__input_shared_mjs__.HTMLEncode)(desc).split('\n').join('<br/>')
97
+ }
98
+ });
99
+ }
100
+ var _field_description;
101
+ return null !== (_field_description = field.description) && void 0 !== _field_description ? _field_description : void 0;
102
+ }, [
95
103
  field.description
96
104
  ]);
97
105
  const className = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>(0, __WEBPACK_EXTERNAL_MODULE_classnames__["default"])(styles.space, {
package/lib/block-provider/hooks/index.js CHANGED
@@ -15,7 +15,7 @@ var __webpack_modules__ = {
15
15
  "../../filter-provider/utils": function(module) {
16
16
  module.exports = require("../../filter-provider/utils.js");
17
17
  },
18
- "../../": function(module) {
18
+ "../..": function(module) {
19
19
  module.exports = require("../../index.js");
20
20
  },
21
21
  "../../record-provider": function(module) {
@@ -69,6 +69,9 @@ var __webpack_modules__ = {
69
69
  antd: function(module) {
70
70
  module.exports = require("antd");
71
71
  },
72
+ flat: function(module) {
73
+ module.exports = require("flat");
74
+ },
72
75
  lodash: function(module) {
73
76
  module.exports = require("lodash");
74
77
  },
@@ -140,6 +143,9 @@ function __webpack_require__(moduleId) {
140
143
  var __webpack_exports__ = {};
141
144
  __webpack_require__.r(__webpack_exports__);
142
145
  __webpack_require__.d(__webpack_exports__, {
146
+ filterByCleanedFields: function() {
147
+ return filterByCleanedFields;
148
+ },
143
149
  findFilterTargets: function() {
144
150
  return findFilterTargets;
145
151
  },
@@ -226,177 +232,204 @@ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("react");
226
232
  var _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("@tachybase/schema");
227
233
  var _tachybase_utils_client__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("@tachybase/utils/client");
228
234
  var antd__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("antd");
229
- var lodash__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("lodash");
230
- var lodash__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/ __webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_4__);
231
- var lodash_get__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("lodash/get");
232
- var lodash_get__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/ __webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_5__);
233
- var lodash_omit__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("lodash/omit");
234
- var lodash_omit__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/ __webpack_require__.n(lodash_omit__WEBPACK_IMPORTED_MODULE_6__);
235
- var react_i18next__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("react-i18next");
236
- var react_router_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("react-router-dom");
237
- var react_to_print__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("react-to-print");
238
- var ___WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../");
239
- var _api_client__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../api-client");
240
- var _built_in_dynamic_page_utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../built-in/dynamic-page/utils");
241
- var _collection_manager__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../collection-manager");
242
- var _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../filter-provider/FilterProvider");
243
- var _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../filter-provider/utils");
244
- var _record_provider__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../record-provider");
245
- var _schema_component__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../schema-component");
246
- var _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../schema-component/antd/association-field/util");
247
- var _user__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../user");
248
- var _variables__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../variables");
249
- var _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../variables/utils/isVariable");
250
- var _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../variables/utils/transformVariableValue");
251
- var _BlockProvider__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../BlockProvider");
252
- var _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../DetailsBlockProvider");
253
- var _TableFieldProvider__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../TableFieldProvider");
254
- var _useFormActiveFields__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("./useFormActiveFields");
235
+ var flat__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("flat");
236
+ var flat__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/ __webpack_require__.n(flat__WEBPACK_IMPORTED_MODULE_4__);
237
+ var lodash__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("lodash");
238
+ var lodash__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/ __webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_5__);
239
+ var lodash_get__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("lodash/get");
240
+ var lodash_get__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/ __webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_6__);
241
+ var lodash_omit__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("lodash/omit");
242
+ var lodash_omit__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/ __webpack_require__.n(lodash_omit__WEBPACK_IMPORTED_MODULE_7__);
243
+ var react_i18next__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("react-i18next");
244
+ var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("react-router-dom");
245
+ var react_to_print__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("react-to-print");
246
+ var ___WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../..");
247
+ var _api_client__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../api-client");
248
+ var _built_in_dynamic_page_utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../built-in/dynamic-page/utils");
249
+ var _collection_manager__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../collection-manager");
250
+ var _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../filter-provider/FilterProvider");
251
+ var _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../filter-provider/utils");
252
+ var _record_provider__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../record-provider");
253
+ var _schema_component__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../schema-component");
254
+ var _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../schema-component/antd/association-field/util");
255
+ var _user__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../user");
256
+ var _variables__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../variables");
257
+ var _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../variables/utils/isVariable");
258
+ var _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../variables/utils/transformVariableValue");
259
+ var _BlockProvider__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../BlockProvider");
260
+ var _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../DetailsBlockProvider");
261
+ var _TableFieldProvider__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../TableFieldProvider");
262
+ var _useFormActiveFields__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("./useFormActiveFields");
255
263
  var __WEBPACK_REEXPORT_OBJECT__ = {};
256
- for(var __WEBPACK_IMPORT_KEY__ in _useFormActiveFields__WEBPACK_IMPORTED_MODULE_26__)if ([
264
+ for(var __WEBPACK_IMPORT_KEY__ in _useFormActiveFields__WEBPACK_IMPORTED_MODULE_27__)if ([
257
265
  "useAssociationCreateActionProps",
258
- "useFilterBlockActionProps",
259
- "getAfterWorkflows",
260
- "findFilterTargets",
261
266
  "useResetBlockActionProps",
267
+ "findFilterTargets",
262
268
  "useInsertSchema",
269
+ "filterByCleanedFields",
270
+ "useOptionalFieldList",
271
+ "useCollectValuesToSubmit",
272
+ "useCreateActionProps",
273
+ "useRemoveActionProps",
274
+ "useCustomizeUpdateActionProps",
275
+ "useRefreshActionProps",
276
+ "useAssociationFilterProps",
277
+ "default",
263
278
  "useAssociationFilterBlockProps",
264
- "getAssociationPath",
279
+ "useFilterBlockActionProps",
280
+ "getAfterWorkflows",
265
281
  "updateFilterTargets",
266
282
  "useUpdateActionProps",
267
283
  "getFormValues",
268
284
  "useDisassociateActionProps",
269
- "useAssociationNames",
270
285
  "useDetailPrintActionProps",
271
- "default",
272
286
  "useCustomizeRequestActionProps",
273
287
  "useCancelActionProps",
274
- "useOptionalFieldList",
275
- "useCreateActionProps",
276
- "useCollectValuesToSubmit",
277
288
  "getBeforeWorkflows",
278
- "useCustomizeUpdateActionProps",
279
- "useRemoveActionProps",
289
+ "useAssociationNames",
290
+ "useDetailsPaginationProps",
280
291
  "useDestroyActionProps",
281
- "useRefreshActionProps",
282
292
  "useBulkDestroyActionProps",
283
- "useDetailsPaginationProps",
284
- "useAssociationFilterProps"
293
+ "getAssociationPath"
285
294
  ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
286
- return _useFormActiveFields__WEBPACK_IMPORTED_MODULE_26__[key];
295
+ return _useFormActiveFields__WEBPACK_IMPORTED_MODULE_27__[key];
287
296
  }).bind(0, __WEBPACK_IMPORT_KEY__);
288
297
  __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
289
- var _useParsedFilter__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("./useParsedFilter");
298
+ var _useParsedFilter__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("./useParsedFilter");
290
299
  var __WEBPACK_REEXPORT_OBJECT__ = {};
291
- for(var __WEBPACK_IMPORT_KEY__ in _useParsedFilter__WEBPACK_IMPORTED_MODULE_27__)if ([
300
+ for(var __WEBPACK_IMPORT_KEY__ in _useParsedFilter__WEBPACK_IMPORTED_MODULE_28__)if ([
292
301
  "useAssociationCreateActionProps",
293
- "useFilterBlockActionProps",
294
- "getAfterWorkflows",
295
- "findFilterTargets",
296
302
  "useResetBlockActionProps",
303
+ "findFilterTargets",
297
304
  "useInsertSchema",
305
+ "filterByCleanedFields",
306
+ "useOptionalFieldList",
307
+ "useCollectValuesToSubmit",
308
+ "useCreateActionProps",
309
+ "useRemoveActionProps",
310
+ "useCustomizeUpdateActionProps",
298
311
  "useRefreshActionProps",
299
- "useBulkDestroyActionProps",
312
+ "useAssociationFilterProps",
313
+ "default",
314
+ "useAssociationFilterBlockProps",
315
+ "useFilterBlockActionProps",
316
+ "getAfterWorkflows",
300
317
  "updateFilterTargets",
301
318
  "useUpdateActionProps",
302
319
  "getFormValues",
303
320
  "useDisassociateActionProps",
304
- "useDetailsPaginationProps",
305
321
  "useDetailPrintActionProps",
306
- "useAssociationFilterProps",
307
322
  "useCustomizeRequestActionProps",
308
323
  "useCancelActionProps",
309
- "useOptionalFieldList",
310
- "useCreateActionProps",
311
- "useAssociationNames",
312
- "default",
313
- "useCollectValuesToSubmit",
314
324
  "getBeforeWorkflows",
315
- "useCustomizeUpdateActionProps",
316
- "useRemoveActionProps",
325
+ "useAssociationNames",
326
+ "useDetailsPaginationProps",
317
327
  "useDestroyActionProps",
318
- "useAssociationFilterBlockProps",
328
+ "useBulkDestroyActionProps",
319
329
  "getAssociationPath"
320
330
  ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
321
- return _useParsedFilter__WEBPACK_IMPORTED_MODULE_27__[key];
331
+ return _useParsedFilter__WEBPACK_IMPORTED_MODULE_28__[key];
322
332
  }).bind(0, __WEBPACK_IMPORT_KEY__);
323
333
  __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
324
- var _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("./useDataBlockSourceId");
334
+ var _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("./useDataBlockSourceId");
325
335
  var __WEBPACK_REEXPORT_OBJECT__ = {};
326
- for(var __WEBPACK_IMPORT_KEY__ in _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_28__)if ([
336
+ for(var __WEBPACK_IMPORT_KEY__ in _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_29__)if ([
327
337
  "useAssociationCreateActionProps",
328
- "useFilterBlockActionProps",
329
- "getAfterWorkflows",
330
- "findFilterTargets",
331
338
  "useResetBlockActionProps",
339
+ "findFilterTargets",
332
340
  "useInsertSchema",
341
+ "filterByCleanedFields",
342
+ "useOptionalFieldList",
343
+ "useCollectValuesToSubmit",
344
+ "useCreateActionProps",
345
+ "useRemoveActionProps",
346
+ "useCustomizeUpdateActionProps",
333
347
  "useRefreshActionProps",
334
- "useBulkDestroyActionProps",
348
+ "useAssociationFilterProps",
349
+ "default",
350
+ "useAssociationFilterBlockProps",
351
+ "useFilterBlockActionProps",
352
+ "getAfterWorkflows",
335
353
  "updateFilterTargets",
336
354
  "useUpdateActionProps",
337
355
  "getFormValues",
338
356
  "useDisassociateActionProps",
339
- "useDetailsPaginationProps",
340
357
  "useDetailPrintActionProps",
341
- "useAssociationFilterProps",
342
358
  "useCustomizeRequestActionProps",
343
359
  "useCancelActionProps",
344
- "useOptionalFieldList",
345
- "useCreateActionProps",
346
- "useAssociationNames",
347
- "default",
348
- "useCollectValuesToSubmit",
349
360
  "getBeforeWorkflows",
350
- "useCustomizeUpdateActionProps",
351
- "useRemoveActionProps",
361
+ "useAssociationNames",
362
+ "useDetailsPaginationProps",
352
363
  "useDestroyActionProps",
353
- "useAssociationFilterBlockProps",
364
+ "useBulkDestroyActionProps",
354
365
  "getAssociationPath"
355
366
  ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
356
- return _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_28__[key];
367
+ return _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_29__[key];
357
368
  }).bind(0, __WEBPACK_IMPORT_KEY__);
358
369
  __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
359
- var _useIsMobile__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("./useIsMobile");
370
+ var _useIsMobile__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("./useIsMobile");
360
371
  var __WEBPACK_REEXPORT_OBJECT__ = {};
361
- for(var __WEBPACK_IMPORT_KEY__ in _useIsMobile__WEBPACK_IMPORTED_MODULE_29__)if ([
372
+ for(var __WEBPACK_IMPORT_KEY__ in _useIsMobile__WEBPACK_IMPORTED_MODULE_30__)if ([
362
373
  "useAssociationCreateActionProps",
363
- "useFilterBlockActionProps",
364
- "getAfterWorkflows",
365
- "findFilterTargets",
366
374
  "useResetBlockActionProps",
375
+ "findFilterTargets",
367
376
  "useInsertSchema",
377
+ "filterByCleanedFields",
378
+ "useOptionalFieldList",
379
+ "useCollectValuesToSubmit",
380
+ "useCreateActionProps",
381
+ "useRemoveActionProps",
382
+ "useCustomizeUpdateActionProps",
368
383
  "useRefreshActionProps",
369
- "useBulkDestroyActionProps",
384
+ "useAssociationFilterProps",
385
+ "default",
386
+ "useAssociationFilterBlockProps",
387
+ "useFilterBlockActionProps",
388
+ "getAfterWorkflows",
370
389
  "updateFilterTargets",
371
390
  "useUpdateActionProps",
372
391
  "getFormValues",
373
392
  "useDisassociateActionProps",
374
- "useDetailsPaginationProps",
375
393
  "useDetailPrintActionProps",
376
- "useAssociationFilterProps",
377
394
  "useCustomizeRequestActionProps",
378
395
  "useCancelActionProps",
379
- "useOptionalFieldList",
380
- "useCreateActionProps",
381
- "useAssociationNames",
382
- "default",
383
- "useCollectValuesToSubmit",
384
396
  "getBeforeWorkflows",
385
- "useCustomizeUpdateActionProps",
386
- "useRemoveActionProps",
397
+ "useAssociationNames",
398
+ "useDetailsPaginationProps",
387
399
  "useDestroyActionProps",
388
- "useAssociationFilterBlockProps",
400
+ "useBulkDestroyActionProps",
389
401
  "getAssociationPath"
390
402
  ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
391
- return _useIsMobile__WEBPACK_IMPORTED_MODULE_29__[key];
403
+ return _useIsMobile__WEBPACK_IMPORTED_MODULE_30__[key];
392
404
  }).bind(0, __WEBPACK_IMPORT_KEY__);
393
405
  __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
394
406
  function renderTemplate(str, data) {
395
407
  const re = /\{\{\s*((\w+\.?)+)\s*\}\}/g;
396
408
  return str.replace(re, function(_, key) {
397
- return lodash_get__WEBPACK_IMPORTED_MODULE_5___default()(data, key) || '';
409
+ return lodash_get__WEBPACK_IMPORTED_MODULE_6___default()(data, key) || '';
398
410
  });
399
411
  }
412
+ function filterByCleanedFields(mergeFilter) {
413
+ const items = flat__WEBPACK_IMPORTED_MODULE_4___default()(mergeFilter);
414
+ const result = {};
415
+ const seen = new Set();
416
+ for(const key in items){
417
+ const value = items[key];
418
+ if (void 0 === value) continue;
419
+ const pathParts = key.split('.');
420
+ const filteredParts = pathParts.filter((p)=>!/^\d+$/.test(p) && ![
421
+ '$and',
422
+ '$or'
423
+ ].includes(p));
424
+ const fieldPath = filteredParts.join('.');
425
+ const uniqueKey = "".concat(fieldPath, "|").concat(JSON.stringify(value));
426
+ if (!seen.has(uniqueKey)) {
427
+ seen.add(uniqueKey);
428
+ result[key] = value;
429
+ }
430
+ }
431
+ return flat__WEBPACK_IMPORTED_MODULE_4___default().unflatten(result);
432
+ }
400
433
  function getFormValues(param) {
401
434
  let { filterByTk, field, form, fieldNames, getField, resource, actionFields } = param;
402
435
  if (filterByTk) {
@@ -410,7 +443,7 @@ function getFormValues(param) {
410
443
  'belongsToMany'
411
444
  ].includes(null == f ? void 0 : f.type);
412
445
  });
413
- return lodash_omit__WEBPACK_IMPORTED_MODULE_6___default()({
446
+ return lodash_omit__WEBPACK_IMPORTED_MODULE_7___default()({
414
447
  ...form.values
415
448
  }, keys);
416
449
  }
@@ -419,18 +452,18 @@ function getFormValues(param) {
419
452
  }
420
453
  function useCollectValuesToSubmit() {
421
454
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
422
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
423
- const { field, resource } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
424
- const { fields, getField, getTreeParentField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
455
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
456
+ const { field, resource } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
457
+ const { fields, getField, getTreeParentField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
425
458
  const fieldNames = fields.map((field)=>field.name);
426
- const { fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
427
- const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormActiveFields)() || {};
428
- const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useVariables)();
429
- const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useLocalVariables)({
459
+ const { fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
460
+ const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
461
+ const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
462
+ const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
430
463
  currentForm: form
431
464
  });
432
465
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
433
- const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_16__.useRecord)();
466
+ const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_17__.useRecord)();
434
467
  return (0, react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(async ()=>{
435
468
  var _fieldSchema_xcomponentprops;
436
469
  var _actionSchema_xactionsettings;
@@ -448,9 +481,9 @@ function useCollectValuesToSubmit() {
448
481
  const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
449
482
  const value = originalAssignedValues[key];
450
483
  const collectionField = getField(key);
451
- if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_21__.isVariable)(value)) {
484
+ if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
452
485
  const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
453
- if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_22__.transformVariableValue)(result, {
486
+ if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
454
487
  targetCollectionField: collectionField
455
488
  });
456
489
  } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -461,7 +494,7 @@ function useCollectValuesToSubmit() {
461
494
  var _currentRecord___parent;
462
495
  const treeParentField = getTreeParentField();
463
496
  var _treeParentField_name;
464
- values[null !== (_treeParentField_name = null == treeParentField ? void 0 : treeParentField.name) && void 0 !== _treeParentField_name ? _treeParentField_name : 'parent'] = lodash_omit__WEBPACK_IMPORTED_MODULE_6___default()(null == currentRecord ? void 0 : currentRecord.__parent, [
497
+ values[null !== (_treeParentField_name = null == treeParentField ? void 0 : treeParentField.name) && void 0 !== _treeParentField_name ? _treeParentField_name : 'parent'] = lodash_omit__WEBPACK_IMPORTED_MODULE_7___default()(null == currentRecord ? void 0 : currentRecord.__parent, [
465
498
  'children'
466
499
  ]);
467
500
  var _treeParentField_foreignKey;
@@ -519,13 +552,13 @@ const viewerSchema = {
519
552
  };
520
553
  const useInsertSchema = ()=>{
521
554
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
522
- const { insertAfterBegin } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useDesignable)();
555
+ const { insertAfterBegin } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useDesignable)();
523
556
  const insert = (0, react__WEBPACK_IMPORTED_MODULE_0__.useCallback)((ss)=>{
524
557
  const schema = fieldSchema.reduceProperties((buf, s)=>{
525
558
  if (s['x-component'] === pageDetailsViewer) return s;
526
559
  return buf;
527
560
  }, null);
528
- if (!schema) insertAfterBegin(lodash__WEBPACK_IMPORTED_MODULE_4___default().cloneDeep(ss));
561
+ if (!schema) insertAfterBegin(lodash__WEBPACK_IMPORTED_MODULE_5___default().cloneDeep(ss));
529
562
  }, [
530
563
  pageDetailsViewer
531
564
  ]);
@@ -533,7 +566,7 @@ const useInsertSchema = ()=>{
533
566
  };
534
567
  const useCancelActionProps = ()=>{
535
568
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
536
- const ctx = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
569
+ const ctx = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
537
570
  return {
538
571
  async onClick () {
539
572
  ctx.setVisible(false);
@@ -542,18 +575,18 @@ const useCancelActionProps = ()=>{
542
575
  };
543
576
  };
544
577
  const useJumpDetails = ()=>{
545
- const collection = (0, ___WEBPACK_IMPORTED_MODULE_10__.useCollection)();
578
+ const collection = (0, ___WEBPACK_IMPORTED_MODULE_11__.useCollection)();
546
579
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
547
- const dn = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useDesignable)();
580
+ const dn = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useDesignable)();
548
581
  const insert = useInsertSchema();
549
- const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_8__.useNavigate)();
582
+ const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
550
583
  return (filterByTk)=>{
551
584
  if (dn.designable) insert(viewerSchema);
552
585
  const targetSchema = fieldSchema.reduceProperties((buf, s)=>{
553
586
  if (s['x-component'] === pageDetailsViewer) return s;
554
587
  return buf;
555
588
  });
556
- if (targetSchema) navigate("../".concat(targetSchema['x-uid'], "/").concat(_built_in_dynamic_page_utils__WEBPACK_IMPORTED_MODULE_12__.PathHandler.getInstance().toWildcardPath({
589
+ if (targetSchema) navigate("../".concat(targetSchema['x-uid'], "/").concat(_built_in_dynamic_page_utils__WEBPACK_IMPORTED_MODULE_13__.PathHandler.getInstance().toWildcardPath({
557
590
  collection: collection.name,
558
591
  filterByTk
559
592
  })));
@@ -575,18 +608,18 @@ function getBeforeWorkflows(triggerWorkflows) {
575
608
  }
576
609
  const useCreateActionProps = ()=>{
577
610
  var _actionField_componentProps_filterKeys;
578
- const record = (0, ___WEBPACK_IMPORTED_MODULE_10__.useCollectionRecord)();
611
+ const record = (0, ___WEBPACK_IMPORTED_MODULE_11__.useCollectionRecord)();
579
612
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
580
- const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
613
+ const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
581
614
  const jumpDetails = useJumpDetails();
582
- const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
583
- const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_8__.useNavigate)();
615
+ const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
616
+ const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
584
617
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
585
618
  const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
586
- const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useCompile)();
619
+ const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
587
620
  const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
588
- const { t } = (0, react_i18next__WEBPACK_IMPORTED_MODULE_7__.useTranslation)();
589
- const { updateAssociationValues } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormBlockContext)();
621
+ const { t } = (0, react_i18next__WEBPACK_IMPORTED_MODULE_8__.useTranslation)();
622
+ const { updateAssociationValues } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormBlockContext)();
590
623
  const collectValues = useCollectValuesToSubmit();
591
624
  const action = record.isNew ? actionField.componentProps.saveMode || 'create' : 'update';
592
625
  const filterKeys = (null === (_actionField_componentProps_filterKeys = actionField.componentProps.filterKeys) || void 0 === _actionField_componentProps_filterKeys ? void 0 : _actionField_componentProps_filterKeys.checked) || [];
@@ -648,20 +681,20 @@ const useCreateActionProps = ()=>{
648
681
  const useAssociationCreateActionProps = ()=>{
649
682
  var _actionField_componentProps_filterKeys;
650
683
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
651
- const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
652
- const { setVisible, fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
684
+ const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
685
+ const { setVisible, fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
653
686
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
654
687
  const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
655
688
  const { message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
656
- const { fields, getField, getTreeParentField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
657
- const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useCompile)();
658
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
659
- const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_16__.useRecord)();
660
- const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useVariables)();
661
- const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useLocalVariables)({
689
+ const { fields, getField, getTreeParentField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
690
+ const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
691
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
692
+ const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_17__.useRecord)();
693
+ const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
694
+ const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
662
695
  currentForm: form
663
696
  });
664
- const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormActiveFields)() || {};
697
+ const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
665
698
  const action = actionField.componentProps.saveMode || 'create';
666
699
  const filterKeys = (null === (_actionField_componentProps_filterKeys = actionField.componentProps.filterKeys) || void 0 === _actionField_componentProps_filterKeys ? void 0 : _actionField_componentProps_filterKeys.checked) || [];
667
700
  return {
@@ -675,9 +708,9 @@ const useAssociationCreateActionProps = ()=>{
675
708
  const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
676
709
  const value = originalAssignedValues[key];
677
710
  const collectionField = getField(key);
678
- if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_21__.isVariable)(value)) {
711
+ if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
679
712
  const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
680
- if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_22__.transformVariableValue)(result, {
713
+ if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
681
714
  targetCollectionField: collectionField
682
715
  });
683
716
  } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -750,9 +783,9 @@ const useFilterBlockActionProps = ()=>{
750
783
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
751
784
  const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
752
785
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
753
- const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_14__.useFilterBlock)();
754
- const { name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
755
- const { getCollectionJoinField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollectionManager_deprecated)();
786
+ const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_15__.useFilterBlock)();
787
+ const { name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
788
+ const { getCollectionJoinField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollectionManager_deprecated)();
756
789
  actionField.data = actionField.data || {};
757
790
  return {
758
791
  async onClick () {
@@ -783,21 +816,22 @@ const useFilterBlockActionProps = ()=>{
783
816
  ...values
784
817
  };
785
818
  for(const key in form.values['__custom'])if (form.values['__custom'][key]) filter.customValues[key] = form.values['__custom'][key];
786
- filter.customFilter = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.getCustomCondition)(filter.customValues, fieldSchema);
819
+ filter.customFilter = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.getCustomCondition)(filter.customValues, fieldSchema);
787
820
  }
788
- storedFilter[uid] = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.removeNullCondition)((0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__.transformToFilter)(filter.formValues, fieldSchema, getCollectionJoinField, name));
789
- const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__.mergeFilter)([
790
- ...Object.values(storedFilter).map((filter)=>(0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.removeNullCondition)(filter)),
821
+ storedFilter[uid] = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.removeNullCondition)((0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.transformToFilter)(filter.formValues, fieldSchema, getCollectionJoinField, name));
822
+ const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
823
+ ...Object.values(storedFilter).map((filter)=>(0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.removeNullCondition)(filter)),
791
824
  block.defaultFilter,
792
825
  filter.customFilter,
793
826
  prevMergedFilter
794
827
  ]);
795
- prevMergedFilter = mergedFilter;
796
- if ('manual' === block.dataLoadingMode && lodash__WEBPACK_IMPORTED_MODULE_4___default().isEmpty(mergedFilter)) return block.clearData();
828
+ const currFilter = filterByCleanedFields(mergedFilter);
829
+ prevMergedFilter = currFilter;
830
+ if ('manual' === block.dataLoadingMode && lodash__WEBPACK_IMPORTED_MODULE_5___default().isEmpty(currFilter)) return block.clearData();
797
831
  return block.doFilter({
798
832
  ...param,
799
833
  page: 1,
800
- filter: mergedFilter
834
+ filter: currFilter
801
835
  }, {
802
836
  filters: storedFilter
803
837
  });
@@ -813,7 +847,7 @@ const useResetBlockActionProps = ()=>{
813
847
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
814
848
  const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
815
849
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
816
- const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_14__.useFilterBlock)();
850
+ const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_15__.useFilterBlock)();
817
851
  actionField.data = actionField.data || {};
818
852
  return {
819
853
  async onClick () {
@@ -830,11 +864,12 @@ const useResetBlockActionProps = ()=>{
830
864
  const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
831
865
  const storedFilter = (null === (_block_service_params1 = block.service.params) || void 0 === _block_service_params1 ? void 0 : null === (_block_service_params_ = _block_service_params1[1]) || void 0 === _block_service_params_ ? void 0 : _block_service_params_.filters) || {};
832
866
  delete storedFilter[uid];
833
- const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__.mergeFilter)([
867
+ const currFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
834
868
  ...Object.values(storedFilter),
835
869
  block.defaultFilter,
836
870
  prevMergedFilter
837
871
  ]);
872
+ const mergedFilter = filterByCleanedFields(currFilter);
838
873
  prevMergedFilter = mergedFilter;
839
874
  return block.doFilter({
840
875
  ...param,
@@ -852,18 +887,18 @@ const useResetBlockActionProps = ()=>{
852
887
  };
853
888
  };
854
889
  const useCustomizeUpdateActionProps = ()=>{
855
- const { resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
856
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
890
+ const { resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
891
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
857
892
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
858
- const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_8__.useNavigate)();
859
- const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useCompile)();
893
+ const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
894
+ const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
860
895
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
861
896
  const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
862
- const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useVariables)();
863
- const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useLocalVariables)({
897
+ const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
898
+ const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
864
899
  currentForm: form
865
900
  });
866
- const { name, getField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
901
+ const { name, getField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
867
902
  return {
868
903
  async onClick () {
869
904
  var _service_refresh;
@@ -873,9 +908,9 @@ const useCustomizeUpdateActionProps = ()=>{
873
908
  const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
874
909
  const value = originalAssignedValues[key];
875
910
  const collectionField = getField(key);
876
- if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_21__.isVariable)(value)) {
911
+ if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
877
912
  const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
878
- if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_22__.transformVariableValue)(result, {
913
+ if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
879
914
  targetCollectionField: collectionField
880
915
  });
881
916
  } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -891,7 +926,7 @@ const useCustomizeUpdateActionProps = ()=>{
891
926
  beforeWorkflows: getBeforeWorkflows(triggerWorkflows)
892
927
  });
893
928
  null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
894
- if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_25__.TableFieldResource)) {
929
+ if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_26__.TableFieldResource)) {
895
930
  var __parent_service_refresh, __parent_service;
896
931
  null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
897
932
  }
@@ -917,21 +952,21 @@ const useCustomizeUpdateActionProps = ()=>{
917
952
  };
918
953
  const useCustomizeRequestActionProps = ()=>{
919
954
  var _currentUserContext_data;
920
- const apiClient = (0, _api_client__WEBPACK_IMPORTED_MODULE_11__.useAPIClient)();
921
- const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_8__.useNavigate)();
922
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
955
+ const apiClient = (0, _api_client__WEBPACK_IMPORTED_MODULE_12__.useAPIClient)();
956
+ const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
957
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
923
958
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
924
- const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useCompile)();
959
+ const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
925
960
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
926
- const { fields, getField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
927
- const { field, resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
928
- const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_16__.useRecord)();
929
- const currentUserContext = (0, _user__WEBPACK_IMPORTED_MODULE_19__.useCurrentUserContext)();
961
+ const { fields, getField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
962
+ const { field, resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
963
+ const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_17__.useRecord)();
964
+ const currentUserContext = (0, _user__WEBPACK_IMPORTED_MODULE_20__.useCurrentUserContext)();
930
965
  const currentUser = null == currentUserContext ? void 0 : null === (_currentUserContext_data = currentUserContext.data) || void 0 === _currentUserContext_data ? void 0 : _currentUserContext_data.data;
931
966
  const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
932
- const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
967
+ const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
933
968
  const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
934
- const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormActiveFields)() || {};
969
+ const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
935
970
  return {
936
971
  async onClick () {
937
972
  var _actionSchema_xactionsettings;
@@ -987,7 +1022,7 @@ const useCustomizeRequestActionProps = ()=>{
987
1022
  ...requestBody
988
1023
  });
989
1024
  actionField.data.loading = false;
990
- if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_25__.TableFieldResource)) {
1025
+ if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_26__.TableFieldResource)) {
991
1026
  var __parent_service_refresh, __parent_service;
992
1027
  null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
993
1028
  }
@@ -1012,22 +1047,22 @@ const useCustomizeRequestActionProps = ()=>{
1012
1047
  };
1013
1048
  const useUpdateActionProps = ()=>{
1014
1049
  const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
1015
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
1016
- const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1017
- const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
1050
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
1051
+ const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1052
+ const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
1018
1053
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
1019
- const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_8__.useNavigate)();
1020
- const { fields, getField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
1021
- const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useCompile)();
1054
+ const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
1055
+ const { fields, getField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
1056
+ const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
1022
1057
  const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
1023
- const { updateAssociationValues } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormBlockContext)();
1058
+ const { updateAssociationValues } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormBlockContext)();
1024
1059
  const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
1025
- const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useParamsFromRecord)();
1026
- const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useVariables)();
1027
- const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_20__.useLocalVariables)({
1060
+ const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useParamsFromRecord)();
1061
+ const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
1062
+ const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
1028
1063
  currentForm: form
1029
1064
  });
1030
- const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormActiveFields)() || {};
1065
+ const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
1031
1066
  return {
1032
1067
  async onClick () {
1033
1068
  var _actionSchema_xactionsettings;
@@ -1036,9 +1071,9 @@ const useUpdateActionProps = ()=>{
1036
1071
  const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
1037
1072
  const value = originalAssignedValues[key];
1038
1073
  const collectionField = getField(key);
1039
- if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_21__.isVariable)(value)) {
1074
+ if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
1040
1075
  const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
1041
- if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_22__.transformVariableValue)(result, {
1076
+ if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
1042
1077
  targetCollectionField: collectionField
1043
1078
  });
1044
1079
  } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -1109,10 +1144,10 @@ const useUpdateActionProps = ()=>{
1109
1144
  };
1110
1145
  };
1111
1146
  const useDestroyActionProps = ()=>{
1112
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
1113
- const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1114
- const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
1115
- const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useParamsFromRecord)();
1147
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
1148
+ const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1149
+ const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
1150
+ const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useParamsFromRecord)();
1116
1151
  const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
1117
1152
  return {
1118
1153
  async onClick () {
@@ -1145,8 +1180,8 @@ const useDestroyActionProps = ()=>{
1145
1180
  };
1146
1181
  };
1147
1182
  const useRemoveActionProps = (associationName)=>{
1148
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
1149
- const api = (0, _api_client__WEBPACK_IMPORTED_MODULE_11__.useAPIClient)();
1183
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
1184
+ const api = (0, _api_client__WEBPACK_IMPORTED_MODULE_12__.useAPIClient)();
1150
1185
  const resource = api.resource(associationName, filterByTk);
1151
1186
  return {
1152
1187
  async onClick (value) {
@@ -1159,9 +1194,9 @@ const useRemoveActionProps = (associationName)=>{
1159
1194
  };
1160
1195
  };
1161
1196
  const useDisassociateActionProps = ()=>{
1162
- const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useFilterByTk)();
1163
- const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1164
- const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.useActionContext)();
1197
+ const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
1198
+ const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1199
+ const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
1165
1200
  return {
1166
1201
  async onClick () {
1167
1202
  var _service_data;
@@ -1190,8 +1225,8 @@ const useDisassociateActionProps = ()=>{
1190
1225
  };
1191
1226
  };
1192
1227
  const useDetailPrintActionProps = ()=>{
1193
- const { formBlockRef } = (0, ___WEBPACK_IMPORTED_MODULE_10__.useFormBlockContext)();
1194
- const printHandler = (0, react_to_print__WEBPACK_IMPORTED_MODULE_9__.useReactToPrint)({
1228
+ const { formBlockRef } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormBlockContext)();
1229
+ const printHandler = (0, react_to_print__WEBPACK_IMPORTED_MODULE_10__.useReactToPrint)({
1195
1230
  content: ()=>formBlockRef.current,
1196
1231
  pageStyle: "@media print {\n * {\n margin: 0;\n }\n :not(.ant-formily-item-control-content-component) > div.ant-formily-layout>div:first-child {\n overflow: hidden; height: 0;\n }\n }"
1197
1232
  });
@@ -1202,8 +1237,8 @@ const useDetailPrintActionProps = ()=>{
1202
1237
  };
1203
1238
  };
1204
1239
  const useBulkDestroyActionProps = ()=>{
1205
- const { field } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1206
- const { resource, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1240
+ const { field } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1241
+ const { resource, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1207
1242
  return {
1208
1243
  async onClick () {
1209
1244
  var _field_data_selectedRowKeys, _field_data, _field_data1, _service_params_, _service_data_meta, _service_data, _service_refresh;
@@ -1220,7 +1255,7 @@ const useBulkDestroyActionProps = ()=>{
1220
1255
  };
1221
1256
  };
1222
1257
  const useRefreshActionProps = ()=>{
1223
- const { service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1258
+ const { service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1224
1259
  return {
1225
1260
  async onClick () {
1226
1261
  var _service_refresh;
@@ -1230,7 +1265,7 @@ const useRefreshActionProps = ()=>{
1230
1265
  };
1231
1266
  const useDetailsPaginationProps = ()=>{
1232
1267
  var _ctx_service_data_meta, _ctx_service_data, _ctx_service, _ctx_service_data_meta1, _ctx_service_data1, _ctx_service1;
1233
- const ctx = (0, _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_24__.useDetailsBlockContext)();
1268
+ const ctx = (0, _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_25__.useDetailsBlockContext)();
1234
1269
  const count = (null === (_ctx_service = ctx.service) || void 0 === _ctx_service ? void 0 : null === (_ctx_service_data = _ctx_service.data) || void 0 === _ctx_service_data ? void 0 : null === (_ctx_service_data_meta = _ctx_service_data.meta) || void 0 === _ctx_service_data_meta ? void 0 : _ctx_service_data_meta.count) || 0;
1235
1270
  return {
1236
1271
  simple: true,
@@ -1255,16 +1290,16 @@ const useDetailsPaginationProps = ()=>{
1255
1290
  };
1256
1291
  const useAssociationFilterProps = ()=>{
1257
1292
  var _cm_getCollection, _fieldSchema_xcomponentprops_fieldNames, _fieldSchema_xcomponentprops, _field_componentProps, _field_componentProps1;
1258
- const collectionField = ___WEBPACK_IMPORTED_MODULE_10__.AssociationFilter.useAssociationField();
1259
- const { service, props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1293
+ const collectionField = ___WEBPACK_IMPORTED_MODULE_11__.AssociationFilter.useAssociationField();
1294
+ const { service, props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1260
1295
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
1261
- const cm = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollectionManager_deprecated)();
1296
+ const cm = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollectionManager_deprecated)();
1262
1297
  const valueKey = (null == collectionField ? void 0 : collectionField.target) ? null === (_cm_getCollection = cm.getCollection(collectionField.target)) || void 0 === _cm_getCollection ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
1263
1298
  const labelKey = (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : null === (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) || void 0 === _fieldSchema_xcomponentprops_fieldNames ? void 0 : _fieldSchema_xcomponentprops_fieldNames.label) || valueKey;
1264
1299
  const field = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
1265
1300
  const collectionFieldName = collectionField.name;
1266
- const headers = (0, ___WEBPACK_IMPORTED_MODULE_10__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
1267
- const { data, params, run } = (0, _api_client__WEBPACK_IMPORTED_MODULE_11__.useRequest)({
1301
+ const headers = (0, ___WEBPACK_IMPORTED_MODULE_11__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
1302
+ const { data, params, run } = (0, _api_client__WEBPACK_IMPORTED_MODULE_12__.useRequest)({
1268
1303
  headers,
1269
1304
  resource: collectionField.target,
1270
1305
  action: 'list',
@@ -1297,7 +1332,7 @@ const useAssociationFilterProps = ()=>{
1297
1332
  ...null === (_service_params1 = service.params) || void 0 === _service_params1 ? void 0 : _service_params1[0],
1298
1333
  pageSize: 200,
1299
1334
  page: 1,
1300
- filter: (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__.mergeFilter)([
1335
+ filter: (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
1301
1336
  ...Object.values(filters),
1302
1337
  null == blockProps ? void 0 : null === (_blockProps_params = blockProps.params) || void 0 === _blockProps_params ? void 0 : _blockProps_params.filter
1303
1338
  ])
@@ -1322,7 +1357,7 @@ const useAssociationFilterProps = ()=>{
1322
1357
  };
1323
1358
  };
1324
1359
  const useOptionalFieldList = ()=>{
1325
- const { currentFields = [] } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollection_deprecated)();
1360
+ const { currentFields = [] } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
1326
1361
  return currentFields.filter((field)=>isOptionalField(field) && field.uiSchema.enum);
1327
1362
  };
1328
1363
  const isOptionalField = (field)=>{
@@ -1337,19 +1372,19 @@ const isOptionalField = (field)=>{
1337
1372
  };
1338
1373
  const useAssociationFilterBlockProps = ()=>{
1339
1374
  var _cm_getCollection, _fieldSchema_xcomponentprops_fieldNames, _fieldSchema_xcomponentprops, _field_componentProps, _field_componentProps1;
1340
- const collectionField = ___WEBPACK_IMPORTED_MODULE_10__.AssociationFilter.useAssociationField();
1375
+ const collectionField = ___WEBPACK_IMPORTED_MODULE_11__.AssociationFilter.useAssociationField();
1341
1376
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
1342
1377
  const optionalFieldList = useOptionalFieldList();
1343
- const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_14__.useFilterBlock)();
1378
+ const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_15__.useFilterBlock)();
1344
1379
  const collectionFieldName = null == collectionField ? void 0 : collectionField.name;
1345
1380
  const field = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
1346
- const { props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_23__.useBlockRequestContext)();
1347
- const headers = (0, ___WEBPACK_IMPORTED_MODULE_10__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
1348
- const cm = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollectionManager_deprecated)();
1381
+ const { props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
1382
+ const headers = (0, ___WEBPACK_IMPORTED_MODULE_11__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
1383
+ const cm = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollectionManager_deprecated)();
1349
1384
  let list, handleSearchInput, params, run, data, valueKey, labelKey, filterKey;
1350
1385
  valueKey = (null == collectionField ? void 0 : collectionField.target) ? null === (_cm_getCollection = cm.getCollection(collectionField.target)) || void 0 === _cm_getCollection ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
1351
1386
  labelKey = (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : null === (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) || void 0 === _fieldSchema_xcomponentprops_fieldNames ? void 0 : _fieldSchema_xcomponentprops_fieldNames.label) || valueKey;
1352
- ({ data, params, run } = (0, _api_client__WEBPACK_IMPORTED_MODULE_11__.useRequest)({
1387
+ ({ data, params, run } = (0, _api_client__WEBPACK_IMPORTED_MODULE_12__.useRequest)({
1353
1388
  headers,
1354
1389
  resource: null == collectionField ? void 0 : collectionField.target,
1355
1390
  action: 'list',
@@ -1427,7 +1462,7 @@ const useAssociationFilterBlockProps = ()=>{
1427
1462
  if ('manual' === block.dataLoadingMode) return block.clearData();
1428
1463
  delete storedFilter[key];
1429
1464
  }
1430
- const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__.mergeFilter)([
1465
+ const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
1431
1466
  ...Object.values(storedFilter),
1432
1467
  block.defaultFilter
1433
1468
  ]);
@@ -1458,7 +1493,7 @@ function getAssociationPath(str) {
1458
1493
  const useAssociationNames = (dataSource)=>{
1459
1494
  let updateAssociationValues = new Set([]);
1460
1495
  let appends = new Set([]);
1461
- const { getCollectionJoinField, getCollection } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_13__.useCollectionManager_deprecated)(dataSource);
1496
+ const { getCollectionJoinField, getCollection } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollectionManager_deprecated)(dataSource);
1462
1497
  const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
1463
1498
  const _getAssociationAppends = (schema, str)=>{
1464
1499
  schema.reduceProperties((pre, s)=>{
@@ -1474,7 +1509,7 @@ const useAssociationNames = (dataSource)=>{
1474
1509
  ].includes(collectionField.type);
1475
1510
  if (null === (_s_xcomponentprops = s['x-component-props']) || void 0 === _s_xcomponentprops ? void 0 : _s_xcomponentprops['appends']) {
1476
1511
  var _s_xcomponentprops3;
1477
- lodash__WEBPACK_IMPORTED_MODULE_4___default().forEach(null === (_s_xcomponentprops3 = s['x-component-props']) || void 0 === _s_xcomponentprops3 ? void 0 : _s_xcomponentprops3['appends'], (append)=>{
1512
+ lodash__WEBPACK_IMPORTED_MODULE_5___default().forEach(null === (_s_xcomponentprops3 = s['x-component-props']) || void 0 === _s_xcomponentprops3 ? void 0 : _s_xcomponentprops3['appends'], (append)=>{
1478
1513
  appends.add(append);
1479
1514
  });
1480
1515
  }
@@ -1578,7 +1613,7 @@ function getTargetField(obj) {
1578
1613
  return keys;
1579
1614
  }
1580
1615
  const keys = getAllKeys(obj);
1581
- const index = lodash__WEBPACK_IMPORTED_MODULE_4___default().findIndex(keys, (key, index)=>{
1616
+ const index = lodash__WEBPACK_IMPORTED_MODULE_5___default().findIndex(keys, (key, index)=>{
1582
1617
  if (key.includes('$') && index > 0) return true;
1583
1618
  });
1584
1619
  const result = keys.slice(0, index);
@@ -1587,7 +1622,7 @@ function getTargetField(obj) {
1587
1622
  async function resetFormCorrectly(form) {
1588
1623
  (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.untracked)(()=>{
1589
1624
  Object.keys(form.fields).forEach((key)=>{
1590
- if ((0, _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_18__.isSubMode)(form.fields[key])) form.fields[key].initialValue = null;
1625
+ if ((0, _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_19__.isSubMode)(form.fields[key])) form.fields[key].initialValue = null;
1591
1626
  });
1592
1627
  });
1593
1628
  await form.reset();
package/lib/modules/blocks/data-blocks/table/hooks/useTableBlockProps.js CHANGED
@@ -43,6 +43,8 @@ __webpack_require__.d(__webpack_exports__, {
43
43
  });
44
44
  const external_react_namespaceObject = require("react");
45
45
  const schema_namespaceObject = require("@tachybase/schema");
46
+ const external_flat_namespaceObject = require("flat");
47
+ var external_flat_default = /*#__PURE__*/ __webpack_require__.n(external_flat_namespaceObject);
46
48
  const external_lodash_namespaceObject = require("lodash");
47
49
  var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
48
50
  const index_js_namespaceObject = require("../../../../../block-provider/hooks/index.js");
@@ -140,8 +142,9 @@ const useTableBlockProps = ()=>{
140
142
  const value = [
141
143
  record[ctx.rowKey]
142
144
  ];
145
+ let prevMergedFilter = {};
143
146
  dataBlocks.forEach((block)=>{
144
- var _block_service_params, _block_service_params_, _block_service_params1;
147
+ var _block_service_params, _block_service_params_, _block_service_params1, _block_service_params_1, _block_service_params2, _block_service;
145
148
  const target = targets.find((target)=>target.uid === block.uid);
146
149
  if (!target) return;
147
150
  const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
@@ -152,20 +155,29 @@ const useTableBlockProps = ()=>{
152
155
  } else storedFilter[uid] = {
153
156
  $and: [
154
157
  {
155
- [target.field || ctx.rowKey]: {
156
- [target.field ? '$in' : '$eq']: value
158
+ [(null == target ? void 0 : target.field) || ctx.rowKey]: {
159
+ [(null == target ? void 0 : target.field) ? '$in' : '$eq']: value
157
160
  }
158
161
  }
159
162
  ]
160
163
  };
164
+ const items = external_flat_default()((null === (_block_service = block.service) || void 0 === _block_service ? void 0 : null === (_block_service_params2 = _block_service.params) || void 0 === _block_service_params2 ? void 0 : null === (_block_service_params_1 = _block_service_params2[0]) || void 0 === _block_service_params_1 ? void 0 : _block_service_params_1.filter) || {});
165
+ Object.entries(items).forEach((param)=>{
166
+ let [key, value] = param;
167
+ if (key.includes(ctx.rowKey) && selectedRow.includes(value)) delete items[key];
168
+ });
161
169
  const mergedFilter = (0, utils_js_namespaceObject.mergeFilter)([
162
170
  ...Object.values(storedFilter).map((filter)=>(0, external_schema_component_index_js_namespaceObject.removeNullCondition)(filter)),
163
- block.defaultFilter
171
+ external_flat_default().unflatten(items),
172
+ block.defaultFilter,
173
+ prevMergedFilter
164
174
  ]);
175
+ const currFilter = (0, index_js_namespaceObject.filterByCleanedFields)(mergedFilter);
176
+ prevMergedFilter = currFilter;
165
177
  return block.doFilter({
166
178
  ...param,
167
179
  page: 1,
168
- filter: mergedFilter
180
+ filter: currFilter
169
181
  }, {
170
182
  filters: storedFilter
171
183
  });
package/lib/schema-component/antd/form-item/FormItem.js CHANGED
@@ -135,11 +135,19 @@ const FormItem = (props)=>{
135
135
  ]);
136
136
  var _schema_xdecoratorprops_showTitle;
137
137
  const showTitle = null === (_schema_xdecoratorprops_showTitle = null === (_schema_xdecoratorprops = schema['x-decorator-props']) || void 0 === _schema_xdecoratorprops ? void 0 : _schema_xdecoratorprops.showTitle) || void 0 === _schema_xdecoratorprops_showTitle || _schema_xdecoratorprops_showTitle;
138
- const extra = (0, external_react_namespaceObject.useMemo)(()=>'string' == typeof field.description ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
139
- dangerouslySetInnerHTML: {
140
- __html: (0, shared_js_namespaceObject.HTMLEncode)(field.description).split('\n').join('<br/>')
141
- }
142
- }) : field.description, [
138
+ const extra = (0, external_react_namespaceObject.useMemo)(()=>{
139
+ if ('string' == typeof field.description) {
140
+ const desc = field.description.trim();
141
+ if (!desc) return;
142
+ return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
143
+ dangerouslySetInnerHTML: {
144
+ __html: (0, shared_js_namespaceObject.HTMLEncode)(desc).split('\n').join('<br/>')
145
+ }
146
+ });
147
+ }
148
+ var _field_description;
149
+ return null !== (_field_description = field.description) && void 0 !== _field_description ? _field_description : void 0;
150
+ }, [
143
151
  field.description
144
152
  ]);
145
153
  const className = (0, external_react_namespaceObject.useMemo)(()=>external_classnames_default()(styles.space, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tachybase/client",
3
- "version": "1.1.2",
3
+ "version": "1.1.8",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.mjs",
@@ -24,7 +24,7 @@
24
24
  "ahooks": "^3.8.4",
25
25
  "antd": "5.22.5",
26
26
  "antd-style": "3.7.1",
27
- "axios": "^1.7.9",
27
+ "axios": "1.7.7",
28
28
  "axios-mock-adapter": "^1.22.0",
29
29
  "classnames": "^2.5.1",
30
30
  "click-to-react-component": "1.1.2",
@@ -65,12 +65,12 @@
65
65
  "react-zoom-pan-pinch": "^3.6.1",
66
66
  "sanitize-html": "2.14.0",
67
67
  "use-deep-compare-effect": "^1.8.1",
68
- "@tachybase/components": "1.1.2",
69
- "@tachybase/schema": "1.1.2",
70
- "@tachybase/evaluators": "1.1.2",
71
- "@tachybase/requirejs": "1.1.2",
72
- "@tachybase/sdk": "1.1.2",
73
- "@tachybase/utils": "1.1.2"
68
+ "@tachybase/evaluators": "1.1.8",
69
+ "@tachybase/components": "1.1.8",
70
+ "@tachybase/requirejs": "1.1.8",
71
+ "@tachybase/sdk": "1.1.8",
72
+ "@tachybase/utils": "1.1.8",
73
+ "@tachybase/schema": "1.1.8"
74
74
  },
75
75
  "devDependencies": {
76
76
  "@testing-library/react": "^16.2.0",