@nocobase/client 0.7.1-alpha.7 → 0.7.2-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/acl/Configuration/schemas/scopes.js +1 -0
- package/es/application/Application.js +0 -4
- package/es/block-provider/BlockSchemaComponentProvider.js +3 -0
- package/es/block-provider/FormBlockProvider.js +2 -1
- package/es/block-provider/FormFieldProvider.d.ts +8 -0
- package/es/block-provider/FormFieldProvider.js +89 -0
- package/es/block-provider/KanbanBlockProvider.js +117 -3
- package/es/block-provider/TableFieldProvider.js +17 -2
- package/es/block-provider/TableSelectorProvider.js +38 -6
- package/es/block-provider/hooks/index.js +10 -3
- package/es/block-provider/index.d.ts +1 -0
- package/es/block-provider/index.js +2 -1
- package/es/collection-manager/CollectionField.js +5 -1
- package/es/collection-manager/CollectionFieldProvider.js +7 -2
- package/es/collection-manager/Configuration/AddFieldAction.js +1 -1
- package/es/collection-manager/Configuration/EditFieldAction.js +1 -1
- package/es/collection-manager/hooks/useCollectionManager.js +20 -5
- package/es/collection-manager/interfaces/index.d.ts +2 -1
- package/es/collection-manager/interfaces/index.js +3 -2
- package/es/collection-manager/interfaces/integer.d.ts +2 -0
- package/es/{workflow/nodes/update.js → collection-manager/interfaces/integer.js} +24 -20
- package/es/collection-manager/interfaces/linkTo.js +14 -6
- package/es/collection-manager/interfaces/m2m.js +12 -5
- package/es/collection-manager/interfaces/m2o.js +59 -8
- package/es/collection-manager/interfaces/o2m.js +72 -46
- package/es/collection-manager/interfaces/o2o.js +100 -39
- package/es/collection-manager/interfaces/properties/operators.d.ts +13 -0
- package/es/collection-manager/interfaces/properties/operators.js +7 -0
- package/es/index.d.ts +0 -1
- package/es/index.js +1 -2
- package/es/locale/en_US.d.ts +7 -0
- package/es/locale/en_US.js +9 -2
- package/es/locale/zh_CN.d.ts +10 -1
- package/es/locale/zh_CN.js +10 -1
- package/es/schema-component/antd/AntdSchemaComponentProvider.js +2 -0
- package/es/schema-component/antd/filter/DynamicComponent.js +50 -3
- package/es/schema-component/antd/filter/FilterItem.js +6 -0
- package/es/schema-component/antd/filter/useFilterActionProps.js +2 -0
- package/es/schema-component/antd/form-item/FormItem.js +79 -16
- package/es/schema-component/antd/form-v2/FormField.d.ts +1 -0
- package/es/schema-component/antd/form-v2/FormField.js +29 -0
- package/es/schema-component/antd/form-v2/index.d.ts +1 -0
- package/es/schema-component/antd/form-v2/index.js +2 -1
- package/es/schema-component/antd/g2plot/G2Plot.js +33 -3
- package/es/schema-component/antd/g2plot/requestChartData.d.ts +4 -0
- package/es/schema-component/antd/g2plot/requestChartData.js +33 -0
- package/es/schema-component/antd/kanban/Kanban.Card.Designer.js +10 -1
- package/es/schema-component/antd/record-picker/InputRecordPicker.js +34 -14
- package/es/schema-component/antd/record-picker/ReadPrettyRecordPicker.js +34 -11
- package/es/schema-component/antd/record-picker/useFieldNames.js +2 -2
- package/es/schema-component/antd/select/shared.js +4 -2
- package/es/schema-component/antd/table-v2/Table.Column.Decorator.d.ts +1 -1
- package/es/schema-component/antd/table-v2/Table.Column.Decorator.js +7 -3
- package/es/schema-component/antd/table-v2/Table.Column.Designer.js +7 -2
- package/es/schema-component/antd/table-v2/Table.js +4 -2
- package/es/schema-component/antd/table-v2/TableField.js +7 -0
- package/es/schema-initializer/buttons/TableColumnInitializers.js +26 -12
- package/es/schema-initializer/components/assigned-field/AssignedField.js +34 -47
- package/es/schema-initializer/utils.d.ts +2 -0
- package/es/schema-initializer/utils.js +160 -30
- package/es/schema-settings/SchemaSettings.js +6 -3
- package/lib/acl/Configuration/schemas/scopes.js +1 -0
- package/lib/application/Application.js +0 -5
- package/lib/block-provider/BlockSchemaComponentProvider.js +4 -0
- package/lib/block-provider/FormBlockProvider.js +2 -1
- package/lib/block-provider/FormFieldProvider.d.ts +8 -0
- package/lib/block-provider/FormFieldProvider.js +120 -0
- package/lib/block-provider/KanbanBlockProvider.js +118 -1
- package/lib/block-provider/TableFieldProvider.js +19 -2
- package/lib/block-provider/TableSelectorProvider.js +39 -5
- package/lib/block-provider/hooks/index.js +11 -3
- package/lib/block-provider/index.d.ts +1 -0
- package/lib/block-provider/index.js +13 -0
- package/lib/collection-manager/CollectionField.js +5 -1
- package/lib/collection-manager/CollectionFieldProvider.js +9 -3
- package/lib/collection-manager/Configuration/AddFieldAction.js +1 -1
- package/lib/collection-manager/Configuration/EditFieldAction.js +1 -1
- package/lib/collection-manager/hooks/useCollectionManager.js +20 -5
- package/lib/collection-manager/interfaces/index.d.ts +2 -1
- package/lib/collection-manager/interfaces/index.js +26 -13
- package/lib/collection-manager/interfaces/integer.d.ts +2 -0
- package/lib/{workflow/nodes/update.js → collection-manager/interfaces/integer.js} +26 -24
- package/lib/collection-manager/interfaces/linkTo.js +14 -6
- package/lib/collection-manager/interfaces/m2m.js +12 -5
- package/lib/collection-manager/interfaces/m2o.js +61 -10
- package/lib/collection-manager/interfaces/o2m.js +72 -45
- package/lib/collection-manager/interfaces/o2o.js +103 -43
- package/lib/collection-manager/interfaces/properties/operators.d.ts +13 -0
- package/lib/collection-manager/interfaces/properties/operators.js +7 -0
- package/lib/index.d.ts +0 -1
- package/lib/index.js +0 -13
- package/lib/locale/en_US.d.ts +7 -0
- package/lib/locale/en_US.js +9 -2
- package/lib/locale/zh_CN.d.ts +10 -1
- package/lib/locale/zh_CN.js +10 -1
- package/lib/schema-component/antd/AntdSchemaComponentProvider.js +3 -0
- package/lib/schema-component/antd/filter/DynamicComponent.js +52 -1
- package/lib/schema-component/antd/filter/FilterItem.js +7 -0
- package/lib/schema-component/antd/filter/useFilterActionProps.js +2 -0
- package/lib/schema-component/antd/form-item/FormItem.js +80 -17
- package/lib/schema-component/antd/form-v2/FormField.d.ts +1 -0
- package/lib/schema-component/antd/form-v2/FormField.js +48 -0
- package/lib/schema-component/antd/form-v2/index.d.ts +1 -0
- package/lib/schema-component/antd/form-v2/index.js +17 -0
- package/lib/schema-component/antd/g2plot/G2Plot.js +32 -2
- package/lib/schema-component/antd/g2plot/requestChartData.d.ts +4 -0
- package/lib/schema-component/antd/g2plot/requestChartData.js +42 -0
- package/lib/schema-component/antd/kanban/Kanban.Card.Designer.js +9 -0
- package/lib/schema-component/antd/record-picker/InputRecordPicker.js +33 -13
- package/lib/schema-component/antd/record-picker/ReadPrettyRecordPicker.js +32 -9
- package/lib/schema-component/antd/record-picker/useFieldNames.js +2 -2
- package/lib/schema-component/antd/select/shared.js +4 -2
- package/lib/schema-component/antd/table-v2/Table.Column.Decorator.d.ts +1 -1
- package/lib/schema-component/antd/table-v2/Table.Column.Decorator.js +6 -2
- package/lib/schema-component/antd/table-v2/Table.Column.Designer.js +7 -2
- package/lib/schema-component/antd/table-v2/Table.js +4 -2
- package/lib/schema-component/antd/table-v2/TableField.js +8 -0
- package/lib/schema-initializer/buttons/TableColumnInitializers.js +25 -11
- package/lib/schema-initializer/components/assigned-field/AssignedField.js +29 -43
- package/lib/schema-initializer/utils.d.ts +2 -0
- package/lib/schema-initializer/utils.js +166 -30
- package/lib/schema-settings/SchemaSettings.js +5 -2
- package/package.json +4 -5
- package/es/workflow/ExecutionResourceProvider.d.ts +0 -4
- package/es/workflow/ExecutionResourceProvider.js +0 -35
- package/es/workflow/WorkflowCanvas.d.ts +0 -15
- package/es/workflow/WorkflowCanvas.js +0 -375
- package/es/workflow/WorkflowLink.d.ts +0 -1
- package/es/workflow/WorkflowLink.js +0 -21
- package/es/workflow/WorkflowPage.d.ts +0 -1
- package/es/workflow/WorkflowPage.js +0 -43
- package/es/workflow/WorkflowRouteProvider.d.ts +0 -1
- package/es/workflow/WorkflowRouteProvider.js +0 -30
- package/es/workflow/WorkflowShortcut.d.ts +0 -1
- package/es/workflow/WorkflowShortcut.js +0 -62
- package/es/workflow/calculators.d.ts +0 -101
- package/es/workflow/calculators.js +0 -647
- package/es/workflow/components/Duration.d.ts +0 -5
- package/es/workflow/components/Duration.js +0 -61
- package/es/workflow/index.d.ts +0 -5
- package/es/workflow/index.js +0 -5
- package/es/workflow/nodes/calculation.d.ts +0 -25
- package/es/workflow/nodes/calculation.js +0 -47
- package/es/workflow/nodes/condition.d.ts +0 -46
- package/es/workflow/nodes/condition.js +0 -255
- package/es/workflow/nodes/create.d.ts +0 -46
- package/es/workflow/nodes/create.js +0 -90
- package/es/workflow/nodes/delay.d.ts +0 -35
- package/es/workflow/nodes/delay.js +0 -37
- package/es/workflow/nodes/destroy.d.ts +0 -55
- package/es/workflow/nodes/destroy.js +0 -27
- package/es/workflow/nodes/index.d.ts +0 -33
- package/es/workflow/nodes/index.js +0 -312
- package/es/workflow/nodes/parallel.d.ts +0 -24
- package/es/workflow/nodes/parallel.js +0 -132
- package/es/workflow/nodes/query.d.ts +0 -70
- package/es/workflow/nodes/query.js +0 -98
- package/es/workflow/nodes/update.d.ts +0 -60
- package/es/workflow/schemas/collection.d.ts +0 -42
- package/es/workflow/schemas/collection.js +0 -57
- package/es/workflow/schemas/executions.d.ts +0 -209
- package/es/workflow/schemas/executions.js +0 -157
- package/es/workflow/schemas/workflows.d.ts +0 -2
- package/es/workflow/schemas/workflows.js +0 -334
- package/es/workflow/style.d.ts +0 -12
- package/es/workflow/style.js +0 -17
- package/es/workflow/triggers/collection.d.ts +0 -77
- package/es/workflow/triggers/collection.js +0 -144
- package/es/workflow/triggers/index.d.ts +0 -26
- package/es/workflow/triggers/index.js +0 -177
- package/es/workflow/triggers/schedule/DateFieldsSelect.d.ts +0 -2
- package/es/workflow/triggers/schedule/DateFieldsSelect.js +0 -39
- package/es/workflow/triggers/schedule/EndsByField.d.ts +0 -5
- package/es/workflow/triggers/schedule/EndsByField.js +0 -57
- package/es/workflow/triggers/schedule/OnField.d.ts +0 -5
- package/es/workflow/triggers/schedule/OnField.js +0 -87
- package/es/workflow/triggers/schedule/RepeatField.d.ts +0 -5
- package/es/workflow/triggers/schedule/RepeatField.js +0 -131
- package/es/workflow/triggers/schedule/ScheduleConfig.d.ts +0 -1
- package/es/workflow/triggers/schedule/ScheduleConfig.js +0 -225
- package/es/workflow/triggers/schedule/index.d.ts +0 -25
- package/es/workflow/triggers/schedule/index.js +0 -77
- package/es/workflow/triggers/schedule/locale/Cron.zh-CN.d.ts +0 -34
- package/es/workflow/triggers/schedule/locale/Cron.zh-CN.js +0 -37
- package/lib/workflow/ExecutionResourceProvider.d.ts +0 -4
- package/lib/workflow/ExecutionResourceProvider.js +0 -48
- package/lib/workflow/WorkflowCanvas.d.ts +0 -15
- package/lib/workflow/WorkflowCanvas.js +0 -408
- package/lib/workflow/WorkflowLink.d.ts +0 -1
- package/lib/workflow/WorkflowLink.js +0 -36
- package/lib/workflow/WorkflowPage.d.ts +0 -1
- package/lib/workflow/WorkflowPage.js +0 -60
- package/lib/workflow/WorkflowRouteProvider.d.ts +0 -1
- package/lib/workflow/WorkflowRouteProvider.js +0 -47
- package/lib/workflow/WorkflowShortcut.d.ts +0 -1
- package/lib/workflow/WorkflowShortcut.js +0 -87
- package/lib/workflow/calculators.d.ts +0 -101
- package/lib/workflow/calculators.js +0 -688
- package/lib/workflow/components/Duration.d.ts +0 -5
- package/lib/workflow/components/Duration.js +0 -74
- package/lib/workflow/index.d.ts +0 -5
- package/lib/workflow/index.js +0 -70
- package/lib/workflow/nodes/calculation.d.ts +0 -25
- package/lib/workflow/nodes/calculation.js +0 -61
- package/lib/workflow/nodes/condition.d.ts +0 -46
- package/lib/workflow/nodes/condition.js +0 -275
- package/lib/workflow/nodes/create.d.ts +0 -46
- package/lib/workflow/nodes/create.js +0 -107
- package/lib/workflow/nodes/delay.d.ts +0 -35
- package/lib/workflow/nodes/delay.js +0 -48
- package/lib/workflow/nodes/destroy.d.ts +0 -55
- package/lib/workflow/nodes/destroy.js +0 -38
- package/lib/workflow/nodes/index.d.ts +0 -33
- package/lib/workflow/nodes/index.js +0 -357
- package/lib/workflow/nodes/parallel.d.ts +0 -24
- package/lib/workflow/nodes/parallel.js +0 -155
- package/lib/workflow/nodes/query.d.ts +0 -70
- package/lib/workflow/nodes/query.js +0 -115
- package/lib/workflow/nodes/update.d.ts +0 -60
- package/lib/workflow/schemas/collection.d.ts +0 -42
- package/lib/workflow/schemas/collection.js +0 -70
- package/lib/workflow/schemas/executions.d.ts +0 -209
- package/lib/workflow/schemas/executions.js +0 -164
- package/lib/workflow/schemas/workflows.d.ts +0 -2
- package/lib/workflow/schemas/workflows.js +0 -344
- package/lib/workflow/style.d.ts +0 -12
- package/lib/workflow/style.js +0 -37
- package/lib/workflow/triggers/collection.d.ts +0 -77
- package/lib/workflow/triggers/collection.js +0 -164
- package/lib/workflow/triggers/index.d.ts +0 -26
- package/lib/workflow/triggers/index.js +0 -201
- package/lib/workflow/triggers/schedule/DateFieldsSelect.d.ts +0 -2
- package/lib/workflow/triggers/schedule/DateFieldsSelect.js +0 -54
- package/lib/workflow/triggers/schedule/EndsByField.d.ts +0 -5
- package/lib/workflow/triggers/schedule/EndsByField.js +0 -73
- package/lib/workflow/triggers/schedule/OnField.d.ts +0 -5
- package/lib/workflow/triggers/schedule/OnField.js +0 -105
- package/lib/workflow/triggers/schedule/RepeatField.d.ts +0 -5
- package/lib/workflow/triggers/schedule/RepeatField.js +0 -146
- package/lib/workflow/triggers/schedule/ScheduleConfig.d.ts +0 -1
- package/lib/workflow/triggers/schedule/ScheduleConfig.js +0 -250
- package/lib/workflow/triggers/schedule/index.d.ts +0 -25
- package/lib/workflow/triggers/schedule/index.js +0 -94
- package/lib/workflow/triggers/schedule/locale/Cron.zh-CN.d.ts +0 -34
- package/lib/workflow/triggers/schedule/locale/Cron.zh-CN.js +0 -44
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.useTableColumnInitializerFields = exports.useRemoveGridFormItem = exports.useRecordCollectionDataSourceItems = exports.useFormItemInitializerFields = exports.useCustomFormItemInitializerFields = exports.useCurrentSchema = exports.useCollectionDataSourceItems = exports.removeTableColumn = exports.removeGridFormItem = exports.itemsMerge = exports.gridRowColWrap = exports.findTableColumn = exports.createTableSelectorSchema = exports.createTableBlockSchema = exports.createReadPrettyFormBlockSchema = exports.createKanbanBlockSchema = exports.createFormBlockSchema = exports.createDetailsBlockSchema = exports.createCalendarBlockSchema = void 0;
|
|
6
|
+
exports.useTableColumnInitializerFields = exports.useRemoveGridFormItem = exports.useRecordCollectionDataSourceItems = exports.useFormItemInitializerFields = exports.useCustomFormItemInitializerFields = exports.useCurrentSchema = exports.useCollectionDataSourceItems = exports.useAssociatedTableColumnInitializerFields = exports.useAssociatedFormItemInitializerFields = exports.removeTableColumn = exports.removeGridFormItem = exports.itemsMerge = exports.gridRowColWrap = exports.findTableColumn = exports.createTableSelectorSchema = exports.createTableBlockSchema = exports.createReadPrettyFormBlockSchema = exports.createKanbanBlockSchema = exports.createFormBlockSchema = exports.createDetailsBlockSchema = exports.createCalendarBlockSchema = void 0;
|
|
7
7
|
|
|
8
8
|
var _react = require("@formily/react");
|
|
9
9
|
|
|
@@ -160,7 +160,7 @@ var useTableColumnInitializerFields = function useTableColumnInitializerFields()
|
|
|
160
160
|
|
|
161
161
|
exports.useTableColumnInitializerFields = useTableColumnInitializerFields;
|
|
162
162
|
|
|
163
|
-
var
|
|
163
|
+
var useAssociatedTableColumnInitializerFields = function useAssociatedTableColumnInitializerFields() {
|
|
164
164
|
var _fields$filter;
|
|
165
165
|
|
|
166
166
|
var _useCollection2 = (0, _collectionManager.useCollection)(),
|
|
@@ -168,7 +168,72 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
|
|
|
168
168
|
fields = _useCollection2.fields;
|
|
169
169
|
|
|
170
170
|
var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
|
|
171
|
-
getInterface = _useCollectionManager2.getInterface
|
|
171
|
+
getInterface = _useCollectionManager2.getInterface,
|
|
172
|
+
getCollectionFields = _useCollectionManager2.getCollectionFields;
|
|
173
|
+
|
|
174
|
+
var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
|
|
175
|
+
return ['o2o', 'oho', 'obo', 'm2o'].includes(field.interface);
|
|
176
|
+
})) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
|
|
177
|
+
var _subFields$filter, _field$uiSchema2;
|
|
178
|
+
|
|
179
|
+
var subFields = getCollectionFields(field.target);
|
|
180
|
+
var items = subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
|
|
181
|
+
=== null || subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
|
|
182
|
+
=== void 0 ? void 0 : (_subFields$filter = subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
|
|
183
|
+
.filter(function (subField) {
|
|
184
|
+
return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface);
|
|
185
|
+
})) === null || _subFields$filter === void 0 ? void 0 : _subFields$filter.map(function (subField) {
|
|
186
|
+
var _subField$uiSchema;
|
|
187
|
+
|
|
188
|
+
var interfaceConfig = getInterface(subField.interface);
|
|
189
|
+
var schema = {
|
|
190
|
+
// type: 'string',
|
|
191
|
+
name: "".concat(field.name, ".").concat(subField.name),
|
|
192
|
+
// title: subField?.uiSchema?.title || subField.name,
|
|
193
|
+
'x-component': 'CollectionField',
|
|
194
|
+
'x-read-pretty': true,
|
|
195
|
+
'x-collection-field': "".concat(name, ".").concat(field.name, ".").concat(subField.name),
|
|
196
|
+
'x-component-props': {}
|
|
197
|
+
};
|
|
198
|
+
return {
|
|
199
|
+
type: 'item',
|
|
200
|
+
title: (subField === null || subField === void 0 ? void 0 : (_subField$uiSchema = subField.uiSchema) === null || _subField$uiSchema === void 0 ? void 0 : _subField$uiSchema.title) || subField.name,
|
|
201
|
+
component: 'TableCollectionFieldInitializer',
|
|
202
|
+
find: findTableColumn,
|
|
203
|
+
remove: removeTableColumn,
|
|
204
|
+
schemaInitialize: function schemaInitialize(s) {
|
|
205
|
+
var _interfaceConfig$sche2;
|
|
206
|
+
|
|
207
|
+
interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche2 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche2 === void 0 ? void 0 : _interfaceConfig$sche2.call(interfaceConfig, s, {
|
|
208
|
+
field: subField,
|
|
209
|
+
readPretty: true,
|
|
210
|
+
block: 'Table'
|
|
211
|
+
});
|
|
212
|
+
},
|
|
213
|
+
field: subField,
|
|
214
|
+
schema: schema
|
|
215
|
+
};
|
|
216
|
+
});
|
|
217
|
+
return {
|
|
218
|
+
type: 'subMenu',
|
|
219
|
+
title: (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title,
|
|
220
|
+
children: items
|
|
221
|
+
};
|
|
222
|
+
});
|
|
223
|
+
return groups;
|
|
224
|
+
};
|
|
225
|
+
|
|
226
|
+
exports.useAssociatedTableColumnInitializerFields = useAssociatedTableColumnInitializerFields;
|
|
227
|
+
|
|
228
|
+
var useFormItemInitializerFields = function useFormItemInitializerFields(options) {
|
|
229
|
+
var _fields$filter2;
|
|
230
|
+
|
|
231
|
+
var _useCollection3 = (0, _collectionManager.useCollection)(),
|
|
232
|
+
name = _useCollection3.name,
|
|
233
|
+
fields = _useCollection3.fields;
|
|
234
|
+
|
|
235
|
+
var _useCollectionManager3 = (0, _collectionManager.useCollectionManager)(),
|
|
236
|
+
getInterface = _useCollectionManager3.getInterface;
|
|
172
237
|
|
|
173
238
|
var form = (0, _react.useForm)();
|
|
174
239
|
|
|
@@ -178,10 +243,10 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
|
|
|
178
243
|
_ref$block = _ref.block,
|
|
179
244
|
block = _ref$block === void 0 ? 'Form' : _ref$block;
|
|
180
245
|
|
|
181
|
-
return fields === null || fields === void 0 ? void 0 : (_fields$
|
|
246
|
+
return fields === null || fields === void 0 ? void 0 : (_fields$filter2 = fields.filter(function (field) {
|
|
182
247
|
return field === null || field === void 0 ? void 0 : field.interface;
|
|
183
|
-
})) === null || _fields$
|
|
184
|
-
var _field$
|
|
248
|
+
})) === null || _fields$filter2 === void 0 ? void 0 : _fields$filter2.map(function (field) {
|
|
249
|
+
var _field$uiSchema3;
|
|
185
250
|
|
|
186
251
|
var interfaceConfig = getInterface(field.interface);
|
|
187
252
|
var schema = {
|
|
@@ -189,20 +254,21 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
|
|
|
189
254
|
name: field.name,
|
|
190
255
|
// title: field?.uiSchema?.title || field.name,
|
|
191
256
|
'x-designer': 'FormItem.Designer',
|
|
192
|
-
'x-component': 'CollectionField',
|
|
257
|
+
'x-component': field.interface === 'o2m' ? 'TableField' : 'CollectionField',
|
|
193
258
|
'x-decorator': 'FormItem',
|
|
194
|
-
'x-collection-field': "".concat(name, ".").concat(field.name)
|
|
259
|
+
'x-collection-field': "".concat(name, ".").concat(field.name),
|
|
260
|
+
'x-component-props': {}
|
|
195
261
|
}; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
|
|
196
262
|
|
|
197
263
|
return {
|
|
198
264
|
type: 'item',
|
|
199
|
-
title: (field === null || field === void 0 ? void 0 : (_field$
|
|
265
|
+
title: (field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title) || field.name,
|
|
200
266
|
component: 'CollectionFieldInitializer',
|
|
201
267
|
remove: removeGridFormItem,
|
|
202
268
|
schemaInitialize: function schemaInitialize(s) {
|
|
203
|
-
var _interfaceConfig$
|
|
269
|
+
var _interfaceConfig$sche3;
|
|
204
270
|
|
|
205
|
-
interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$
|
|
271
|
+
interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche3 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche3 === void 0 ? void 0 : _interfaceConfig$sche3.call(interfaceConfig, s, {
|
|
206
272
|
field: field,
|
|
207
273
|
block: block,
|
|
208
274
|
readPretty: readPretty
|
|
@@ -215,15 +281,16 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
|
|
|
215
281
|
|
|
216
282
|
exports.useFormItemInitializerFields = useFormItemInitializerFields;
|
|
217
283
|
|
|
218
|
-
var
|
|
219
|
-
var _fields$
|
|
284
|
+
var useAssociatedFormItemInitializerFields = function useAssociatedFormItemInitializerFields(options) {
|
|
285
|
+
var _fields$filter3;
|
|
220
286
|
|
|
221
|
-
var
|
|
222
|
-
name =
|
|
223
|
-
fields =
|
|
287
|
+
var _useCollection4 = (0, _collectionManager.useCollection)(),
|
|
288
|
+
name = _useCollection4.name,
|
|
289
|
+
fields = _useCollection4.fields;
|
|
224
290
|
|
|
225
|
-
var
|
|
226
|
-
getInterface =
|
|
291
|
+
var _useCollectionManager4 = (0, _collectionManager.useCollectionManager)(),
|
|
292
|
+
getInterface = _useCollectionManager4.getInterface,
|
|
293
|
+
getCollectionFields = _useCollectionManager4.getCollectionFields;
|
|
227
294
|
|
|
228
295
|
var form = (0, _react.useForm)();
|
|
229
296
|
|
|
@@ -233,19 +300,88 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
|
|
|
233
300
|
_ref2$block = _ref2.block,
|
|
234
301
|
block = _ref2$block === void 0 ? 'Form' : _ref2$block;
|
|
235
302
|
|
|
303
|
+
var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter3 = fields.filter(function (field) {
|
|
304
|
+
return ['o2o', 'oho', 'obo', 'm2o'].includes(field.interface);
|
|
305
|
+
})) === null || _fields$filter3 === void 0 ? void 0 : _fields$filter3.map(function (field) {
|
|
306
|
+
var _subFields$filter2, _field$uiSchema4;
|
|
307
|
+
|
|
308
|
+
var subFields = getCollectionFields(field.target);
|
|
309
|
+
var items = subFields === null || subFields === void 0 ? void 0 : (_subFields$filter2 = subFields.filter(function (subField) {
|
|
310
|
+
return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface);
|
|
311
|
+
})) === null || _subFields$filter2 === void 0 ? void 0 : _subFields$filter2.map(function (subField) {
|
|
312
|
+
var _subField$uiSchema2;
|
|
313
|
+
|
|
314
|
+
var interfaceConfig = getInterface(subField.interface);
|
|
315
|
+
var schema = {
|
|
316
|
+
type: 'string',
|
|
317
|
+
name: "".concat(field.name, ".").concat(subField.name),
|
|
318
|
+
// title: subField?.uiSchema?.title || subField.name,
|
|
319
|
+
'x-designer': 'FormItem.Designer',
|
|
320
|
+
'x-component': 'CollectionField',
|
|
321
|
+
'x-component-props': {},
|
|
322
|
+
'x-decorator': 'FormItem',
|
|
323
|
+
'x-collection-field': "".concat(name, ".").concat(field.name, ".").concat(subField.name)
|
|
324
|
+
}; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
|
|
325
|
+
|
|
326
|
+
return {
|
|
327
|
+
type: 'item',
|
|
328
|
+
title: (subField === null || subField === void 0 ? void 0 : (_subField$uiSchema2 = subField.uiSchema) === null || _subField$uiSchema2 === void 0 ? void 0 : _subField$uiSchema2.title) || subField.name,
|
|
329
|
+
component: 'CollectionFieldInitializer',
|
|
330
|
+
remove: removeGridFormItem,
|
|
331
|
+
schemaInitialize: function schemaInitialize(s) {
|
|
332
|
+
var _interfaceConfig$sche4;
|
|
333
|
+
|
|
334
|
+
interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche4 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche4 === void 0 ? void 0 : _interfaceConfig$sche4.call(interfaceConfig, s, {
|
|
335
|
+
field: subField,
|
|
336
|
+
block: block,
|
|
337
|
+
readPretty: readPretty
|
|
338
|
+
});
|
|
339
|
+
},
|
|
340
|
+
schema: schema
|
|
341
|
+
};
|
|
342
|
+
});
|
|
343
|
+
return {
|
|
344
|
+
type: 'subMenu',
|
|
345
|
+
title: (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title,
|
|
346
|
+
children: items
|
|
347
|
+
};
|
|
348
|
+
});
|
|
349
|
+
return groups;
|
|
350
|
+
};
|
|
351
|
+
|
|
352
|
+
exports.useAssociatedFormItemInitializerFields = useAssociatedFormItemInitializerFields;
|
|
353
|
+
|
|
354
|
+
var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFields(options) {
|
|
355
|
+
var _fields$filter4;
|
|
356
|
+
|
|
357
|
+
var _useCollection5 = (0, _collectionManager.useCollection)(),
|
|
358
|
+
name = _useCollection5.name,
|
|
359
|
+
fields = _useCollection5.fields;
|
|
360
|
+
|
|
361
|
+
var _useCollectionManager5 = (0, _collectionManager.useCollectionManager)(),
|
|
362
|
+
getInterface = _useCollectionManager5.getInterface;
|
|
363
|
+
|
|
364
|
+
var form = (0, _react.useForm)();
|
|
365
|
+
|
|
366
|
+
var _ref3 = options || {},
|
|
367
|
+
_ref3$readPretty = _ref3.readPretty,
|
|
368
|
+
readPretty = _ref3$readPretty === void 0 ? form.readPretty : _ref3$readPretty,
|
|
369
|
+
_ref3$block = _ref3.block,
|
|
370
|
+
block = _ref3$block === void 0 ? 'Form' : _ref3$block;
|
|
371
|
+
|
|
236
372
|
var remove = useRemoveGridFormItem();
|
|
237
|
-
return fields === null || fields === void 0 ? void 0 : (_fields$
|
|
238
|
-
var _field$
|
|
373
|
+
return fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
|
|
374
|
+
var _field$uiSchema5;
|
|
239
375
|
|
|
240
|
-
return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$
|
|
241
|
-
})) === null || _fields$
|
|
242
|
-
var _field$
|
|
376
|
+
return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5['x-read-pretty']);
|
|
377
|
+
})) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
|
|
378
|
+
var _field$uiSchema6, _field$uiSchema7;
|
|
243
379
|
|
|
244
380
|
var interfaceConfig = getInterface(field.interface);
|
|
245
381
|
var schema = {
|
|
246
382
|
type: 'string',
|
|
247
383
|
name: field.name,
|
|
248
|
-
title: (field === null || field === void 0 ? void 0 : (_field$
|
|
384
|
+
title: (field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6.title) || field.name,
|
|
249
385
|
'x-designer': 'FormItem.Designer',
|
|
250
386
|
'x-component': 'AssignedField',
|
|
251
387
|
'x-decorator': 'FormItem',
|
|
@@ -253,13 +389,13 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
|
|
|
253
389
|
};
|
|
254
390
|
return {
|
|
255
391
|
type: 'item',
|
|
256
|
-
title: (field === null || field === void 0 ? void 0 : (_field$
|
|
392
|
+
title: (field === null || field === void 0 ? void 0 : (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7.title) || field.name,
|
|
257
393
|
component: 'CollectionFieldInitializer',
|
|
258
394
|
remove: remove,
|
|
259
395
|
schemaInitialize: function schemaInitialize(s) {
|
|
260
|
-
var _interfaceConfig$
|
|
396
|
+
var _interfaceConfig$sche5;
|
|
261
397
|
|
|
262
|
-
interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$
|
|
398
|
+
interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche5 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche5 === void 0 ? void 0 : _interfaceConfig$sche5.call(interfaceConfig, s, {
|
|
263
399
|
field: field,
|
|
264
400
|
block: block,
|
|
265
401
|
readPretty: readPretty
|
|
@@ -273,6 +409,7 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
|
|
|
273
409
|
exports.useCustomFormItemInitializerFields = useCustomFormItemInitializerFields;
|
|
274
410
|
|
|
275
411
|
var findSchema = function findSchema(schema, key, action) {
|
|
412
|
+
if (!_react.Schema.isSchemaInstance(schema)) return null;
|
|
276
413
|
return schema.reduceProperties(function (buf, s) {
|
|
277
414
|
if (s[key] === action) {
|
|
278
415
|
return s;
|
|
@@ -387,8 +524,8 @@ var useCollectionDataSourceItems = function useCollectionDataSourceItems(compone
|
|
|
387
524
|
var _useTranslation2 = (0, _reactI18next.useTranslation)(),
|
|
388
525
|
t = _useTranslation2.t;
|
|
389
526
|
|
|
390
|
-
var
|
|
391
|
-
collections =
|
|
527
|
+
var _useCollectionManager6 = (0, _collectionManager.useCollectionManager)(),
|
|
528
|
+
collections = _useCollectionManager6.collections;
|
|
392
529
|
|
|
393
530
|
var _useSchemaTemplateMan2 = (0, _schemaTemplates.useSchemaTemplateManager)(),
|
|
394
531
|
getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;
|
|
@@ -542,7 +679,6 @@ var createFormBlockSchema = function createFormBlockSchema(options) {
|
|
|
542
679
|
template = options.template,
|
|
543
680
|
others = _objectWithoutProperties(options, _excluded2);
|
|
544
681
|
|
|
545
|
-
console.log('createFormBlockSchema', options);
|
|
546
682
|
var resourceName = resource || association || collection;
|
|
547
683
|
var schema = {
|
|
548
684
|
type: 'void',
|
|
@@ -847,6 +847,7 @@ SchemaSettings.ModalItem = function (props) {
|
|
|
847
847
|
others = _objectWithoutProperties(props, _excluded7);
|
|
848
848
|
|
|
849
849
|
var options = (0, _react2.useContext)(_react.SchemaOptionsContext);
|
|
850
|
+
var cm = (0, _react2.useContext)(_.CollectionManagerContext);
|
|
850
851
|
|
|
851
852
|
if (hidden) {
|
|
852
853
|
return null;
|
|
@@ -855,7 +856,9 @@ SchemaSettings.ModalItem = function (props) {
|
|
|
855
856
|
return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
|
|
856
857
|
onClick: function onClick() {
|
|
857
858
|
(0, _antd.FormDialog)(schema.title || title, function () {
|
|
858
|
-
return /*#__PURE__*/_react2.default.createElement(_.
|
|
859
|
+
return /*#__PURE__*/_react2.default.createElement(_.CollectionManagerContext.Provider, {
|
|
860
|
+
value: cm
|
|
861
|
+
}, /*#__PURE__*/_react2.default.createElement(_.SchemaComponentOptions, {
|
|
859
862
|
scope: options.scope,
|
|
860
863
|
components: options.components
|
|
861
864
|
}, /*#__PURE__*/_react2.default.createElement(_antd.FormLayout, {
|
|
@@ -864,7 +867,7 @@ SchemaSettings.ModalItem = function (props) {
|
|
|
864
867
|
components: components,
|
|
865
868
|
scope: scope,
|
|
866
869
|
schema: schema
|
|
867
|
-
})));
|
|
870
|
+
}))));
|
|
868
871
|
}).open({
|
|
869
872
|
initialValues: initialValues,
|
|
870
873
|
effects: effects
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/client",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.2-alpha.3",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"licenses": [
|
|
6
6
|
{
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"@formily/antd": "2.0.20",
|
|
20
20
|
"@formily/core": "2.0.20",
|
|
21
21
|
"@formily/react": "2.0.20",
|
|
22
|
-
"@nocobase/sdk": "0.7.
|
|
23
|
-
"@nocobase/utils": "0.7.
|
|
22
|
+
"@nocobase/sdk": "0.7.2-alpha.3",
|
|
23
|
+
"@nocobase/utils": "0.7.2-alpha.3",
|
|
24
24
|
"ahooks": "^3.0.5",
|
|
25
25
|
"antd": "~4.19.5",
|
|
26
26
|
"axios": "^0.26.1",
|
|
@@ -36,7 +36,6 @@
|
|
|
36
36
|
"react-helmet": "^6.1.0",
|
|
37
37
|
"react-i18next": "^11.15.1",
|
|
38
38
|
"react-image-lightbox": "^5.1.4",
|
|
39
|
-
"react-js-cron": "^1.4.0",
|
|
40
39
|
"react-quill": "^1.3.5",
|
|
41
40
|
"react-router-dom": "^5.2.0",
|
|
42
41
|
"use-deep-compare-effect": "^1.8.1"
|
|
@@ -53,5 +52,5 @@
|
|
|
53
52
|
"@types/marked": "^4.0.1",
|
|
54
53
|
"axios-mock-adapter": "^1.20.0"
|
|
55
54
|
},
|
|
56
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "7ab5ec36f6408dd2fab545970a08679e8c2820e5"
|
|
57
56
|
}
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
var _excluded = ["request"];
|
|
2
|
-
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
|
-
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
|
-
|
|
7
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
8
|
-
|
|
9
|
-
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
10
|
-
|
|
11
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
12
|
-
|
|
13
|
-
import React from "react";
|
|
14
|
-
import { ResourceActionProvider, useRecord } from "..";
|
|
15
|
-
export var ExecutionResourceProvider = function ExecutionResourceProvider(_ref) {
|
|
16
|
-
var _request$params;
|
|
17
|
-
|
|
18
|
-
var request = _ref.request,
|
|
19
|
-
others = _objectWithoutProperties(_ref, _excluded);
|
|
20
|
-
|
|
21
|
-
var workflow = useRecord();
|
|
22
|
-
|
|
23
|
-
var props = _objectSpread(_objectSpread({}, others), {}, {
|
|
24
|
-
request: _objectSpread(_objectSpread({}, request), {}, {
|
|
25
|
-
params: _objectSpread(_objectSpread({}, request === null || request === void 0 ? void 0 : request.params), {}, {
|
|
26
|
-
filter: _objectSpread(_objectSpread({}, request === null || request === void 0 ? void 0 : (_request$params = request.params) === null || _request$params === void 0 ? void 0 : _request$params.filter), {}, {
|
|
27
|
-
key: workflow.key
|
|
28
|
-
})
|
|
29
|
-
})
|
|
30
|
-
}),
|
|
31
|
-
workflow: workflow
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
return /*#__PURE__*/React.createElement(ResourceActionProvider, _objectSpread({}, props));
|
|
35
|
-
};
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
|
-
export declare function useFlowContext(): any;
|
|
3
|
-
export declare function WorkflowCanvas(): JSX.Element;
|
|
4
|
-
export declare function Branch({ from, entry, branchIndex, controller }: {
|
|
5
|
-
from?: any;
|
|
6
|
-
entry?: any;
|
|
7
|
-
branchIndex?: any;
|
|
8
|
-
controller?: any;
|
|
9
|
-
}): JSX.Element;
|
|
10
|
-
interface AddButtonProps {
|
|
11
|
-
upstream: any;
|
|
12
|
-
branchIndex?: number;
|
|
13
|
-
}
|
|
14
|
-
export declare function AddButton({ upstream, branchIndex }: AddButtonProps): JSX.Element;
|
|
15
|
-
export {};
|