@nocobase/client 0.7.3-alpha.1 → 0.7.4-alpha.7
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/application/Application.d.ts +1 -0
- package/es/application/Application.js +7 -1
- package/es/block-provider/FormBlockProvider.js +7 -0
- package/es/block-provider/TableFieldProvider.d.ts +1 -0
- package/es/block-provider/TableFieldProvider.js +5 -2
- package/es/block-provider/TableSelectorProvider.js +1 -1
- package/es/block-provider/hooks/index.js +14 -2
- package/es/collection-manager/CollectionField.js +9 -4
- package/es/collection-manager/Configuration/AddFieldAction.js +6 -0
- package/es/collection-manager/Configuration/EditFieldAction.js +7 -0
- package/es/collection-manager/Configuration/index.js +5 -1
- package/es/collection-manager/Configuration/schemas/collections.js +3 -2
- package/es/collection-manager/action-hooks.d.ts +3 -0
- package/es/collection-manager/action-hooks.js +91 -36
- package/es/collection-manager/interfaces/checkbox.js +1 -0
- package/es/collection-manager/interfaces/checkboxGroup.js +1 -0
- package/es/collection-manager/interfaces/datetime.js +1 -0
- package/es/collection-manager/interfaces/email.js +1 -0
- package/es/collection-manager/interfaces/icon.js +1 -0
- package/es/collection-manager/interfaces/input.js +1 -0
- package/es/collection-manager/interfaces/integer.js +1 -0
- package/es/collection-manager/interfaces/m2m.js +2 -0
- package/es/collection-manager/interfaces/m2o.js +1 -0
- package/es/collection-manager/interfaces/markdown.js +1 -0
- package/es/collection-manager/interfaces/multipleSelect.js +1 -0
- package/es/collection-manager/interfaces/number.js +1 -0
- package/es/collection-manager/interfaces/o2m.js +1 -0
- package/es/collection-manager/interfaces/o2o.js +3 -0
- package/es/collection-manager/interfaces/password.js +3 -1
- package/es/collection-manager/interfaces/percent.js +1 -0
- package/es/collection-manager/interfaces/phone.js +1 -0
- package/es/collection-manager/interfaces/properties/index.d.ts +1 -0
- package/es/collection-manager/interfaces/properties/index.js +1 -0
- package/es/collection-manager/interfaces/properties/operators.js +4 -4
- package/es/collection-manager/interfaces/radioGroup.js +1 -0
- package/es/collection-manager/interfaces/richText.js +1 -0
- package/es/collection-manager/interfaces/select.js +1 -0
- package/es/collection-manager/interfaces/textarea.js +1 -0
- package/es/collection-manager/interfaces/time.js +1 -0
- package/es/locale/en_US.d.ts +3 -2
- package/es/locale/en_US.js +4 -3
- package/es/locale/zh_CN.d.ts +5 -2
- package/es/locale/zh_CN.js +5 -2
- package/es/plugin-manager/PluginManager.d.ts +1 -0
- package/es/plugin-manager/PluginManager.js +12 -2
- package/es/schema-component/antd/calendar/Calendar.Designer.js +16 -10
- package/es/schema-component/antd/date-picker/DatePicker.d.ts +1 -1
- package/es/schema-component/antd/date-picker/DatePicker.js +1 -1
- package/es/schema-component/antd/date-picker/ReadPretty.js +1 -1
- package/es/schema-component/antd/date-picker/util.d.ts +0 -10
- package/es/schema-component/antd/date-picker/util.js +1 -79
- package/es/schema-component/antd/form-item/FormItem.js +39 -9
- package/es/schema-component/antd/input-number/InputNumber.js +1 -1
- package/es/schema-component/antd/input-number/ReadPretty.js +2 -4
- package/es/schema-component/antd/record-picker/InputRecordPicker.js +1 -1
- package/es/schema-component/antd/record-picker/ReadPrettyRecordPicker.js +1 -1
- package/es/schema-component/antd/table-v2/Table.Column.Designer.js +3 -1
- package/es/schema-component/antd/table-v2/Table.d.ts +0 -11
- package/es/schema-component/antd/table-v2/Table.js +162 -88
- package/es/schema-component/antd/table-v2/TableField.js +3 -0
- package/es/schema-component/antd/tabs/Tabs.Designer.js +23 -12
- package/es/schema-component/antd/tabs/Tabs.js +7 -1
- package/es/schema-component/core/DesignableSwitch.js +7 -1
- package/es/schema-initializer/buttons/TabPaneInitializers.js +11 -3
- package/es/schema-initializer/components/assigned-field/AssignedField.js +6 -4
- package/es/schema-initializer/items/index.js +2 -1
- package/es/schema-initializer/utils.js +16 -0
- package/es/schema-settings/SchemaSettings.js +7 -0
- package/lib/application/Application.d.ts +1 -0
- package/lib/application/Application.js +11 -2
- package/lib/block-provider/FormBlockProvider.js +8 -0
- package/lib/block-provider/TableFieldProvider.d.ts +1 -0
- package/lib/block-provider/TableFieldProvider.js +4 -1
- package/lib/block-provider/TableSelectorProvider.js +1 -1
- package/lib/block-provider/hooks/index.js +14 -2
- package/lib/collection-manager/CollectionField.js +9 -4
- package/lib/collection-manager/Configuration/AddFieldAction.js +6 -0
- package/lib/collection-manager/Configuration/EditFieldAction.js +7 -0
- package/lib/collection-manager/Configuration/index.js +5 -0
- package/lib/collection-manager/Configuration/schemas/collections.js +3 -2
- package/lib/collection-manager/action-hooks.d.ts +3 -0
- package/lib/collection-manager/action-hooks.js +98 -37
- package/lib/collection-manager/interfaces/checkbox.js +1 -0
- package/lib/collection-manager/interfaces/checkboxGroup.js +1 -0
- package/lib/collection-manager/interfaces/datetime.js +1 -0
- package/lib/collection-manager/interfaces/email.js +1 -0
- package/lib/collection-manager/interfaces/icon.js +1 -0
- package/lib/collection-manager/interfaces/input.js +1 -0
- package/lib/collection-manager/interfaces/integer.js +1 -0
- package/lib/collection-manager/interfaces/m2m.js +2 -0
- package/lib/collection-manager/interfaces/m2o.js +1 -0
- package/lib/collection-manager/interfaces/markdown.js +1 -0
- package/lib/collection-manager/interfaces/multipleSelect.js +1 -0
- package/lib/collection-manager/interfaces/number.js +1 -0
- package/lib/collection-manager/interfaces/o2m.js +1 -0
- package/lib/collection-manager/interfaces/o2o.js +3 -0
- package/lib/collection-manager/interfaces/password.js +4 -2
- package/lib/collection-manager/interfaces/percent.js +1 -0
- package/lib/collection-manager/interfaces/phone.js +1 -0
- package/lib/collection-manager/interfaces/properties/index.d.ts +1 -0
- package/lib/collection-manager/interfaces/properties/index.js +1 -0
- package/lib/collection-manager/interfaces/properties/operators.js +4 -4
- package/lib/collection-manager/interfaces/radioGroup.js +1 -0
- package/lib/collection-manager/interfaces/richText.js +1 -0
- package/lib/collection-manager/interfaces/select.js +1 -0
- package/lib/collection-manager/interfaces/textarea.js +1 -0
- package/lib/collection-manager/interfaces/time.js +1 -0
- package/lib/locale/en_US.d.ts +3 -2
- package/lib/locale/en_US.js +4 -3
- package/lib/locale/zh_CN.d.ts +5 -2
- package/lib/locale/zh_CN.js +5 -2
- package/lib/plugin-manager/PluginManager.d.ts +1 -0
- package/lib/plugin-manager/PluginManager.js +15 -2
- package/lib/schema-component/antd/calendar/Calendar.Designer.js +16 -10
- package/lib/schema-component/antd/date-picker/DatePicker.d.ts +1 -1
- package/lib/schema-component/antd/date-picker/DatePicker.js +2 -2
- package/lib/schema-component/antd/date-picker/ReadPretty.js +6 -6
- package/lib/schema-component/antd/date-picker/util.d.ts +0 -10
- package/lib/schema-component/antd/date-picker/util.js +6 -89
- package/lib/schema-component/antd/form-item/FormItem.js +42 -18
- package/lib/schema-component/antd/input-number/InputNumber.js +6 -6
- package/lib/schema-component/antd/input-number/ReadPretty.js +2 -5
- package/lib/schema-component/antd/record-picker/InputRecordPicker.js +2 -2
- package/lib/schema-component/antd/record-picker/ReadPrettyRecordPicker.js +1 -1
- package/lib/schema-component/antd/table-v2/Table.Column.Designer.js +3 -1
- package/lib/schema-component/antd/table-v2/Table.d.ts +0 -11
- package/lib/schema-component/antd/table-v2/Table.js +171 -90
- package/lib/schema-component/antd/table-v2/TableField.js +3 -0
- package/lib/schema-component/antd/tabs/Tabs.Designer.js +23 -12
- package/lib/schema-component/antd/tabs/Tabs.js +8 -1
- package/lib/schema-component/core/DesignableSwitch.js +8 -1
- package/lib/schema-initializer/buttons/TabPaneInitializers.js +11 -3
- package/lib/schema-initializer/components/assigned-field/AssignedField.js +7 -4
- package/lib/schema-initializer/items/index.js +2 -1
- package/lib/schema-initializer/utils.js +16 -0
- package/lib/schema-settings/SchemaSettings.js +7 -0
- package/package.json +5 -4
|
@@ -51,6 +51,11 @@ import { BlockTemplateDetails, BlockTemplatePage, SchemaTemplateShortcut } from
|
|
|
51
51
|
import { SystemSettingsProvider, SystemSettingsShortcut } from '../system-settings';
|
|
52
52
|
import { SigninPage, SignupPage } from '../user';
|
|
53
53
|
import { compose } from './compose';
|
|
54
|
+
export var getCurrentTimezone = function getCurrentTimezone() {
|
|
55
|
+
var timezoneOffset = new Date().getTimezoneOffset() / -60;
|
|
56
|
+
var timezone = String(timezoneOffset).padStart(2, '0') + ':00';
|
|
57
|
+
return (timezoneOffset > 0 ? '+' : '-') + timezone;
|
|
58
|
+
};
|
|
54
59
|
export var Application = /*#__PURE__*/function () {
|
|
55
60
|
function Application(options) {
|
|
56
61
|
var _window, _window$location;
|
|
@@ -65,7 +70,8 @@ export var Application = /*#__PURE__*/function () {
|
|
|
65
70
|
this.apiClient = new APIClient(_objectSpread({
|
|
66
71
|
baseURL: process.env.API_BASE_URL,
|
|
67
72
|
headers: {
|
|
68
|
-
'X-Hostname': (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname
|
|
73
|
+
'X-Hostname': (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname,
|
|
74
|
+
'X-Timezone': getCurrentTimezone()
|
|
69
75
|
}
|
|
70
76
|
}, options.apiClient));
|
|
71
77
|
this.i18n = options.i18n || i18n;
|
|
@@ -8,10 +8,13 @@ import { createForm } from '@formily/core';
|
|
|
8
8
|
import { useField } from '@formily/react';
|
|
9
9
|
import { Spin } from 'antd';
|
|
10
10
|
import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
|
|
11
|
+
import { RecordProvider } from '../record-provider';
|
|
11
12
|
import { BlockProvider, useBlockRequestContext } from './BlockProvider';
|
|
12
13
|
export var FormBlockContext = /*#__PURE__*/createContext({});
|
|
13
14
|
|
|
14
15
|
var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
|
|
16
|
+
var _service$data;
|
|
17
|
+
|
|
15
18
|
var action = props.action,
|
|
16
19
|
readPretty = props.readPretty;
|
|
17
20
|
var field = useField();
|
|
@@ -41,8 +44,12 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
|
|
|
41
44
|
updateAssociationValues: [],
|
|
42
45
|
formBlockRef: formBlockRef
|
|
43
46
|
}
|
|
47
|
+
}, readPretty ? /*#__PURE__*/React.createElement(RecordProvider, {
|
|
48
|
+
record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
|
|
44
49
|
}, /*#__PURE__*/React.createElement("div", {
|
|
45
50
|
ref: formBlockRef
|
|
51
|
+
}, props.children)) : /*#__PURE__*/React.createElement("div", {
|
|
52
|
+
ref: formBlockRef
|
|
46
53
|
}, props.children));
|
|
47
54
|
};
|
|
48
55
|
|
|
@@ -14,7 +14,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
|
|
|
14
14
|
|
|
15
15
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
16
16
|
|
|
17
|
-
import { useField } from '@formily/react';
|
|
17
|
+
import { useField, useFieldSchema } from '@formily/react';
|
|
18
18
|
import React, { createContext, useContext, useEffect } from 'react';
|
|
19
19
|
import { BlockProvider, useBlockRequestContext } from './BlockProvider';
|
|
20
20
|
import { useFormBlockContext } from './FormBlockProvider';
|
|
@@ -30,6 +30,7 @@ var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
|
|
|
30
30
|
dragSort = props.dragSort,
|
|
31
31
|
fieldName = props.fieldName;
|
|
32
32
|
var field = useField();
|
|
33
|
+
var fieldSchema = useFieldSchema();
|
|
33
34
|
|
|
34
35
|
var _useBlockRequestConte = useBlockRequestContext(),
|
|
35
36
|
resource = _useBlockRequestConte.resource,
|
|
@@ -51,6 +52,7 @@ var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
|
|
|
51
52
|
return /*#__PURE__*/React.createElement(TableFieldContext.Provider, {
|
|
52
53
|
value: {
|
|
53
54
|
field: field,
|
|
55
|
+
fieldSchema: fieldSchema,
|
|
54
56
|
service: service,
|
|
55
57
|
resource: resource,
|
|
56
58
|
params: params,
|
|
@@ -277,7 +279,7 @@ export var useTableFieldContext = function useTableFieldContext() {
|
|
|
277
279
|
return useContext(TableFieldContext);
|
|
278
280
|
};
|
|
279
281
|
export var useTableFieldProps = function useTableFieldProps() {
|
|
280
|
-
var _ctx$service3, _ctx$service4;
|
|
282
|
+
var _ctx$service3, _ctx$service4, _ctx$fieldSchema, _ctx$fieldSchema$pare;
|
|
281
283
|
|
|
282
284
|
var field = useField();
|
|
283
285
|
var ctx = useTableFieldContext();
|
|
@@ -298,6 +300,7 @@ export var useTableFieldProps = function useTableFieldProps() {
|
|
|
298
300
|
showIndex: ctx.showIndex,
|
|
299
301
|
dragSort: ctx.dragSort,
|
|
300
302
|
pagination: false,
|
|
303
|
+
required: ctx === null || ctx === void 0 ? void 0 : (_ctx$fieldSchema = ctx.fieldSchema) === null || _ctx$fieldSchema === void 0 ? void 0 : (_ctx$fieldSchema$pare = _ctx$fieldSchema.parent) === null || _ctx$fieldSchema$pare === void 0 ? void 0 : _ctx$fieldSchema$pare.required,
|
|
301
304
|
rowKey: function rowKey(record) {
|
|
302
305
|
var _field$value, _field$value$indexOf;
|
|
303
306
|
|
|
@@ -79,7 +79,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
|
|
|
79
79
|
params['sort'] = ['sort'];
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
if (
|
|
82
|
+
if (!Object.keys(params).includes('appends')) {
|
|
83
83
|
params['appends'] = appends;
|
|
84
84
|
}
|
|
85
85
|
|
|
@@ -714,13 +714,20 @@ export var useDestroyActionProps = function useDestroyActionProps() {
|
|
|
714
714
|
|
|
715
715
|
var _useBlockRequestConte5 = useBlockRequestContext(),
|
|
716
716
|
resource = _useBlockRequestConte5.resource,
|
|
717
|
-
service = _useBlockRequestConte5.service
|
|
717
|
+
service = _useBlockRequestConte5.service,
|
|
718
|
+
block = _useBlockRequestConte5.block,
|
|
719
|
+
__parent = _useBlockRequestConte5.__parent;
|
|
720
|
+
|
|
721
|
+
var _useActionContext4 = useActionContext(),
|
|
722
|
+
setVisible = _useActionContext4.setVisible;
|
|
718
723
|
|
|
719
724
|
return {
|
|
720
725
|
onClick: function onClick() {
|
|
721
726
|
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
|
|
722
727
|
var _service$refresh3;
|
|
723
728
|
|
|
729
|
+
var _parent$service5, _parent$service5$refr;
|
|
730
|
+
|
|
724
731
|
return regeneratorRuntime.wrap(function _callee9$(_context9) {
|
|
725
732
|
while (1) {
|
|
726
733
|
switch (_context9.prev = _context9.next) {
|
|
@@ -733,7 +740,12 @@ export var useDestroyActionProps = function useDestroyActionProps() {
|
|
|
733
740
|
case 2:
|
|
734
741
|
service === null || service === void 0 ? void 0 : (_service$refresh3 = service.refresh) === null || _service$refresh3 === void 0 ? void 0 : _service$refresh3.call(service);
|
|
735
742
|
|
|
736
|
-
|
|
743
|
+
if (block !== 'TableField') {
|
|
744
|
+
__parent === null || __parent === void 0 ? void 0 : (_parent$service5 = __parent.service) === null || _parent$service5 === void 0 ? void 0 : (_parent$service5$refr = _parent$service5.refresh) === null || _parent$service5$refr === void 0 ? void 0 : _parent$service5$refr.call(_parent$service5);
|
|
745
|
+
setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
|
|
746
|
+
}
|
|
747
|
+
|
|
748
|
+
case 4:
|
|
737
749
|
case "end":
|
|
738
750
|
return _context9.stop();
|
|
739
751
|
}
|
|
@@ -6,11 +6,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
|
6
6
|
|
|
7
7
|
import { connect, useField, useFieldSchema } from '@formily/react';
|
|
8
8
|
import { merge } from '@formily/shared';
|
|
9
|
+
import { concat } from 'lodash';
|
|
9
10
|
import React, { useEffect } from 'react';
|
|
10
11
|
import { useCompile, useComponent, useFormBlockContext } from '..';
|
|
11
12
|
import { CollectionFieldProvider } from './CollectionFieldProvider';
|
|
12
|
-
import { useCollectionField } from './hooks';
|
|
13
|
-
import { concat } from 'lodash'; // TODO: 初步适配
|
|
13
|
+
import { useCollectionField } from './hooks'; // TODO: 初步适配
|
|
14
14
|
|
|
15
15
|
var InternalField = function InternalField(props) {
|
|
16
16
|
var field = useField();
|
|
@@ -19,8 +19,10 @@ var InternalField = function InternalField(props) {
|
|
|
19
19
|
var _useCollectionField = useCollectionField(),
|
|
20
20
|
name = _useCollectionField.name,
|
|
21
21
|
interfaceType = _useCollectionField.interface,
|
|
22
|
-
uiSchema = _useCollectionField.uiSchema
|
|
22
|
+
uiSchema = _useCollectionField.uiSchema,
|
|
23
|
+
defaultValue = _useCollectionField.defaultValue;
|
|
23
24
|
|
|
25
|
+
var collectionField = useCollectionField();
|
|
24
26
|
var component = useComponent(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']);
|
|
25
27
|
var compile = useCompile();
|
|
26
28
|
|
|
@@ -50,7 +52,10 @@ var InternalField = function InternalField(props) {
|
|
|
50
52
|
setFieldProps('content', uiSchema['x-content']);
|
|
51
53
|
setFieldProps('title', uiSchema.title);
|
|
52
54
|
setFieldProps('description', uiSchema.description);
|
|
53
|
-
|
|
55
|
+
|
|
56
|
+
if (ctx === null || ctx === void 0 ? void 0 : ctx.form) {
|
|
57
|
+
setFieldProps('initialValue', fieldSchema.default || defaultValue);
|
|
58
|
+
}
|
|
54
59
|
|
|
55
60
|
if (!field.validator && (uiSchema['x-validator'] || fieldSchema['x-validator'])) {
|
|
56
61
|
var concatSchema = concat([], uiSchema['x-validator'] || [], fieldSchema['x-validator'] || []);
|
|
@@ -43,6 +43,12 @@ var getSchema = function getSchema(schema, record, compile) {
|
|
|
43
43
|
|
|
44
44
|
var properties = cloneDeep(schema.properties);
|
|
45
45
|
|
|
46
|
+
if (schema.hasDefaultValue === true) {
|
|
47
|
+
properties['defaultValue'] = cloneDeep(schema.default.uiSchema);
|
|
48
|
+
properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
|
|
49
|
+
properties['defaultValue']['x-decorator'] = 'FormItem';
|
|
50
|
+
}
|
|
51
|
+
|
|
46
52
|
var initialValue = _objectSpread(_objectSpread({
|
|
47
53
|
name: "f_".concat(uid())
|
|
48
54
|
}, cloneDeep(schema.default)), {}, {
|
|
@@ -42,6 +42,13 @@ var getSchema = function getSchema(schema, record, compile) {
|
|
|
42
42
|
|
|
43
43
|
var properties = cloneDeep(schema.properties);
|
|
44
44
|
properties.name['x-disabled'] = true;
|
|
45
|
+
|
|
46
|
+
if (schema.hasDefaultValue === true) {
|
|
47
|
+
properties['defaultValue'] = cloneDeep(schema.default.uiSchema);
|
|
48
|
+
properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
|
|
49
|
+
properties['defaultValue']['x-decorator'] = 'FormItem';
|
|
50
|
+
}
|
|
51
|
+
|
|
45
52
|
return {
|
|
46
53
|
type: 'object',
|
|
47
54
|
properties: _defineProperty({}, uid(), {
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import { registerValidateFormats } from '@formily/core';
|
|
1
2
|
export * from './AddFieldAction';
|
|
2
3
|
export * from './ConfigurationTable';
|
|
3
|
-
export * from './EditFieldAction';
|
|
4
|
+
export * from './EditFieldAction';
|
|
5
|
+
registerValidateFormats({
|
|
6
|
+
uid: /^[A-Za-z0-9][A-Za-z0-9_-]*$/
|
|
7
|
+
});
|
|
@@ -113,7 +113,8 @@ export var collectionSchema = {
|
|
|
113
113
|
},
|
|
114
114
|
name: {
|
|
115
115
|
'x-component': 'CollectionField',
|
|
116
|
-
'x-decorator': 'FormItem'
|
|
116
|
+
'x-decorator': 'FormItem',
|
|
117
|
+
'x-validator': 'uid'
|
|
117
118
|
},
|
|
118
119
|
footer: {
|
|
119
120
|
type: 'void',
|
|
@@ -254,7 +255,7 @@ export var collectionSchema = {
|
|
|
254
255
|
'x-component': 'Action',
|
|
255
256
|
'x-component-props': {
|
|
256
257
|
type: 'primary',
|
|
257
|
-
useAction: '{{ cm.
|
|
258
|
+
useAction: '{{ cm.useUpdateCollectionActionAndRefreshCM }}'
|
|
258
259
|
}
|
|
259
260
|
}
|
|
260
261
|
}
|
|
@@ -56,6 +56,9 @@ export declare const useDestroyAction: () => {
|
|
|
56
56
|
export declare const useBulkDestroyAction: () => {
|
|
57
57
|
run(): Promise<void>;
|
|
58
58
|
};
|
|
59
|
+
export declare const useUpdateCollectionActionAndRefreshCM: (options: any) => {
|
|
60
|
+
run(): Promise<void>;
|
|
61
|
+
};
|
|
59
62
|
export declare const useValuesFromRecord: (options: any) => {
|
|
60
63
|
state: {};
|
|
61
64
|
setState: (patch: Partial<{}> | ((prevState: {}) => Partial<{}>)) => void;
|
|
@@ -28,6 +28,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
|
|
|
28
28
|
|
|
29
29
|
import { useForm } from '@formily/react';
|
|
30
30
|
import { message } from 'antd';
|
|
31
|
+
import omit from 'lodash/omit';
|
|
31
32
|
import { useEffect } from 'react';
|
|
32
33
|
import { useCollection, useCollectionManager } from '.';
|
|
33
34
|
import { useRequest } from '../api-client';
|
|
@@ -567,6 +568,60 @@ export var useBulkDestroyAction = function useBulkDestroyAction() {
|
|
|
567
568
|
}
|
|
568
569
|
};
|
|
569
570
|
};
|
|
571
|
+
export var useUpdateCollectionActionAndRefreshCM = function useUpdateCollectionActionAndRefreshCM(options) {
|
|
572
|
+
var _useCollectionManager3 = useCollectionManager(),
|
|
573
|
+
refreshCM = _useCollectionManager3.refreshCM;
|
|
574
|
+
|
|
575
|
+
var form = useForm();
|
|
576
|
+
var ctx = useActionContext();
|
|
577
|
+
|
|
578
|
+
var _useResourceActionCon8 = useResourceActionContext(),
|
|
579
|
+
refresh = _useResourceActionCon8.refresh;
|
|
580
|
+
|
|
581
|
+
var _useResourceContext8 = useResourceContext(),
|
|
582
|
+
resource = _useResourceContext8.resource,
|
|
583
|
+
targetKey = _useResourceContext8.targetKey;
|
|
584
|
+
|
|
585
|
+
var _useRecord4 = useRecord(),
|
|
586
|
+
filterByTk = _useRecord4[targetKey];
|
|
587
|
+
|
|
588
|
+
return {
|
|
589
|
+
run: function run() {
|
|
590
|
+
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
|
|
591
|
+
return regeneratorRuntime.wrap(function _callee12$(_context12) {
|
|
592
|
+
while (1) {
|
|
593
|
+
switch (_context12.prev = _context12.next) {
|
|
594
|
+
case 0:
|
|
595
|
+
_context12.next = 2;
|
|
596
|
+
return form.submit();
|
|
597
|
+
|
|
598
|
+
case 2:
|
|
599
|
+
_context12.next = 4;
|
|
600
|
+
return resource.update({
|
|
601
|
+
filterByTk: filterByTk,
|
|
602
|
+
values: omit(form.values, ['fields'])
|
|
603
|
+
});
|
|
604
|
+
|
|
605
|
+
case 4:
|
|
606
|
+
ctx.setVisible(false);
|
|
607
|
+
_context12.next = 7;
|
|
608
|
+
return form.reset();
|
|
609
|
+
|
|
610
|
+
case 7:
|
|
611
|
+
refresh();
|
|
612
|
+
_context12.next = 10;
|
|
613
|
+
return refreshCM();
|
|
614
|
+
|
|
615
|
+
case 10:
|
|
616
|
+
case "end":
|
|
617
|
+
return _context12.stop();
|
|
618
|
+
}
|
|
619
|
+
}
|
|
620
|
+
}, _callee12);
|
|
621
|
+
}))();
|
|
622
|
+
}
|
|
623
|
+
};
|
|
624
|
+
};
|
|
570
625
|
export var useValuesFromRecord = function useValuesFromRecord(options) {
|
|
571
626
|
var record = useRecord();
|
|
572
627
|
var result = useRequest(function () {
|
|
@@ -596,29 +651,29 @@ export var useCreateActionAndRefreshCM = function useCreateActionAndRefreshCM()
|
|
|
596
651
|
var _useCreateAction = useCreateAction(),
|
|
597
652
|
_run3 = _useCreateAction.run;
|
|
598
653
|
|
|
599
|
-
var
|
|
600
|
-
refreshCM =
|
|
654
|
+
var _useCollectionManager4 = useCollectionManager(),
|
|
655
|
+
refreshCM = _useCollectionManager4.refreshCM;
|
|
601
656
|
|
|
602
657
|
return {
|
|
603
658
|
run: function run() {
|
|
604
|
-
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function
|
|
605
|
-
return regeneratorRuntime.wrap(function
|
|
659
|
+
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
|
|
660
|
+
return regeneratorRuntime.wrap(function _callee13$(_context13) {
|
|
606
661
|
while (1) {
|
|
607
|
-
switch (
|
|
662
|
+
switch (_context13.prev = _context13.next) {
|
|
608
663
|
case 0:
|
|
609
|
-
|
|
664
|
+
_context13.next = 2;
|
|
610
665
|
return _run3();
|
|
611
666
|
|
|
612
667
|
case 2:
|
|
613
|
-
|
|
668
|
+
_context13.next = 4;
|
|
614
669
|
return refreshCM();
|
|
615
670
|
|
|
616
671
|
case 4:
|
|
617
672
|
case "end":
|
|
618
|
-
return
|
|
673
|
+
return _context13.stop();
|
|
619
674
|
}
|
|
620
675
|
}
|
|
621
|
-
},
|
|
676
|
+
}, _callee13);
|
|
622
677
|
}))();
|
|
623
678
|
}
|
|
624
679
|
};
|
|
@@ -627,29 +682,29 @@ export var useUpdateActionAndRefreshCM = function useUpdateActionAndRefreshCM()
|
|
|
627
682
|
var _useUpdateAction = useUpdateAction(),
|
|
628
683
|
_run4 = _useUpdateAction.run;
|
|
629
684
|
|
|
630
|
-
var
|
|
631
|
-
refreshCM =
|
|
685
|
+
var _useCollectionManager5 = useCollectionManager(),
|
|
686
|
+
refreshCM = _useCollectionManager5.refreshCM;
|
|
632
687
|
|
|
633
688
|
return {
|
|
634
689
|
run: function run() {
|
|
635
|
-
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function
|
|
636
|
-
return regeneratorRuntime.wrap(function
|
|
690
|
+
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
|
|
691
|
+
return regeneratorRuntime.wrap(function _callee14$(_context14) {
|
|
637
692
|
while (1) {
|
|
638
|
-
switch (
|
|
693
|
+
switch (_context14.prev = _context14.next) {
|
|
639
694
|
case 0:
|
|
640
|
-
|
|
695
|
+
_context14.next = 2;
|
|
641
696
|
return _run4();
|
|
642
697
|
|
|
643
698
|
case 2:
|
|
644
|
-
|
|
699
|
+
_context14.next = 4;
|
|
645
700
|
return refreshCM();
|
|
646
701
|
|
|
647
702
|
case 4:
|
|
648
703
|
case "end":
|
|
649
|
-
return
|
|
704
|
+
return _context14.stop();
|
|
650
705
|
}
|
|
651
706
|
}
|
|
652
|
-
},
|
|
707
|
+
}, _callee14);
|
|
653
708
|
}))();
|
|
654
709
|
}
|
|
655
710
|
};
|
|
@@ -658,29 +713,29 @@ export var useDestroyActionAndRefreshCM = function useDestroyActionAndRefreshCM(
|
|
|
658
713
|
var _useDestroyAction = useDestroyAction(),
|
|
659
714
|
_run5 = _useDestroyAction.run;
|
|
660
715
|
|
|
661
|
-
var
|
|
662
|
-
refreshCM =
|
|
716
|
+
var _useCollectionManager6 = useCollectionManager(),
|
|
717
|
+
refreshCM = _useCollectionManager6.refreshCM;
|
|
663
718
|
|
|
664
719
|
return {
|
|
665
720
|
run: function run() {
|
|
666
|
-
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function
|
|
667
|
-
return regeneratorRuntime.wrap(function
|
|
721
|
+
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
|
|
722
|
+
return regeneratorRuntime.wrap(function _callee15$(_context15) {
|
|
668
723
|
while (1) {
|
|
669
|
-
switch (
|
|
724
|
+
switch (_context15.prev = _context15.next) {
|
|
670
725
|
case 0:
|
|
671
|
-
|
|
726
|
+
_context15.next = 2;
|
|
672
727
|
return _run5();
|
|
673
728
|
|
|
674
729
|
case 2:
|
|
675
|
-
|
|
730
|
+
_context15.next = 4;
|
|
676
731
|
return refreshCM();
|
|
677
732
|
|
|
678
733
|
case 4:
|
|
679
734
|
case "end":
|
|
680
|
-
return
|
|
735
|
+
return _context15.stop();
|
|
681
736
|
}
|
|
682
737
|
}
|
|
683
|
-
},
|
|
738
|
+
}, _callee15);
|
|
684
739
|
}))();
|
|
685
740
|
}
|
|
686
741
|
};
|
|
@@ -689,29 +744,29 @@ export var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRe
|
|
|
689
744
|
var _useBulkDestroyAction = useBulkDestroyAction(),
|
|
690
745
|
_run6 = _useBulkDestroyAction.run;
|
|
691
746
|
|
|
692
|
-
var
|
|
693
|
-
refreshCM =
|
|
747
|
+
var _useCollectionManager7 = useCollectionManager(),
|
|
748
|
+
refreshCM = _useCollectionManager7.refreshCM;
|
|
694
749
|
|
|
695
750
|
return {
|
|
696
751
|
run: function run() {
|
|
697
|
-
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function
|
|
698
|
-
return regeneratorRuntime.wrap(function
|
|
752
|
+
return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
|
|
753
|
+
return regeneratorRuntime.wrap(function _callee16$(_context16) {
|
|
699
754
|
while (1) {
|
|
700
|
-
switch (
|
|
755
|
+
switch (_context16.prev = _context16.next) {
|
|
701
756
|
case 0:
|
|
702
|
-
|
|
757
|
+
_context16.next = 2;
|
|
703
758
|
return _run6();
|
|
704
759
|
|
|
705
760
|
case 2:
|
|
706
|
-
|
|
761
|
+
_context16.next = 4;
|
|
707
762
|
return refreshCM();
|
|
708
763
|
|
|
709
764
|
case 4:
|
|
710
765
|
case "end":
|
|
711
|
-
return
|
|
766
|
+
return _context16.stop();
|
|
712
767
|
}
|
|
713
768
|
}
|
|
714
|
-
},
|
|
769
|
+
}, _callee16);
|
|
715
770
|
}))();
|
|
716
771
|
}
|
|
717
772
|
};
|
|
@@ -184,6 +184,7 @@ export var m2m = {
|
|
|
184
184
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
185
185
|
'x-decorator': 'FormItem',
|
|
186
186
|
'x-component': 'Input',
|
|
187
|
+
'x-validator': 'uid',
|
|
187
188
|
'x-disabled': '{{ !createOnly }}'
|
|
188
189
|
}
|
|
189
190
|
}
|
|
@@ -216,6 +217,7 @@ export var m2m = {
|
|
|
216
217
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
217
218
|
'x-decorator': 'FormItem',
|
|
218
219
|
'x-component': 'Input',
|
|
220
|
+
'x-validator': 'uid',
|
|
219
221
|
'x-disabled': '{{ !createOnly }}'
|
|
220
222
|
}
|
|
221
223
|
}
|
|
@@ -183,6 +183,7 @@ export var m2o = {
|
|
|
183
183
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
184
184
|
'x-decorator': 'FormItem',
|
|
185
185
|
'x-component': 'Input',
|
|
186
|
+
'x-validator': 'uid',
|
|
186
187
|
'x-disabled': '{{ !createOnly }}'
|
|
187
188
|
}
|
|
188
189
|
}
|
|
@@ -211,6 +211,7 @@ export var o2m = {
|
|
|
211
211
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
212
212
|
'x-decorator': 'FormItem',
|
|
213
213
|
'x-component': 'Input',
|
|
214
|
+
'x-validator': 'uid',
|
|
214
215
|
'x-disabled': '{{ !createOnly }}'
|
|
215
216
|
}
|
|
216
217
|
}
|
|
@@ -210,6 +210,7 @@ export var o2o = {
|
|
|
210
210
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
211
211
|
'x-decorator': 'FormItem',
|
|
212
212
|
'x-component': 'Input',
|
|
213
|
+
'x-validator': 'uid',
|
|
213
214
|
'x-disabled': '{{ !createOnly }}'
|
|
214
215
|
}
|
|
215
216
|
}
|
|
@@ -380,6 +381,7 @@ export var oho = {
|
|
|
380
381
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
381
382
|
'x-decorator': 'FormItem',
|
|
382
383
|
'x-component': 'Input',
|
|
384
|
+
'x-validator': 'uid',
|
|
383
385
|
'x-disabled': '{{ !createOnly }}'
|
|
384
386
|
}
|
|
385
387
|
}
|
|
@@ -537,6 +539,7 @@ export var obo = {
|
|
|
537
539
|
description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
|
|
538
540
|
'x-decorator': 'FormItem',
|
|
539
541
|
'x-component': 'Input',
|
|
542
|
+
'x-validator': 'uid',
|
|
540
543
|
'x-disabled': '{{ !createOnly }}'
|
|
541
544
|
}
|
|
542
545
|
}
|