@nocobase/client 0.7.6-alpha.2 → 0.8.0-alpha.4

package/es/schema-component/antd/input/ReadPretty.js

@@ -1,9 +1,14 @@
+var _templateObject;
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 import { usePrefixCls } from '@formily/antd/lib/__builtins__';
 import cls from 'classnames';
 import React from 'react';
 import { useCompile } from '../..';
 import { EllipsisWithTooltip } from './EllipsisWithTooltip';
 import { HTMLEncode } from './shared';
+import { cx, css } from '@emotion/css';
 export var ReadPretty = function ReadPretty() {
   return null;
 };
@@ -90,4 +95,14 @@ ReadPretty.URL = function (props) {
     className: cls(prefixCls, props.className),
     style: props.style
   }, props.addonBefore, props.prefix, content, props.suffix, props.addonAfter);
+};
+
+ReadPretty.JSON = function (props) {
+  var _props$space;
+
+  var prefixCls = usePrefixCls('json', props);
+  return /*#__PURE__*/React.createElement("pre", {
+    className: cx(prefixCls, props.className, css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-bottom: 0;\n      "])))),
+    style: props.style
+  }, props.value != null ? JSON.stringify(props.value, null, (_props$space = props.space) !== null && _props$space !== void 0 ? _props$space : 2) : '');
 };

package/es/schema-component/antd/input/index.d.ts

@@ -1,2 +1,3 @@
 export * from './Input';
 export * from './ReadPretty';
+export * from './Json';

package/es/schema-component/antd/input/index.js

@@ -1,2 +1,3 @@
 export * from './Input';
-export * from './ReadPretty';
+export * from './ReadPretty';
+export * from './Json';

package/es/schema-component/antd/markdown/Markdown.Void.js

@@ -22,6 +22,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { observer, useField, useFieldSchema } from '@formily/react';
 import { Button, Input as AntdInput, Space } from 'antd';
+import cls from 'classnames';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDesignable } from '../../hooks/useDesignable';
@@ -74,7 +75,8 @@ var MarkdownEditor = function MarkdownEditor(props) {
 };
 
 export var MarkdownVoid = observer(function (props) {
-  var content = props.content;
+  var content = props.content,
+      className = props.className;
   var field = useField();
   var schema = useFieldSchema();
 
@@ -84,6 +86,7 @@ export var MarkdownVoid = observer(function (props) {
   var onSave = props.onSave,
       _onCancel = props.onCancel;
   return (field === null || field === void 0 ? void 0 : field.editable) ? /*#__PURE__*/React.createElement(MarkdownEditor, _objectSpread(_objectSpread({}, props), {}, {
+    className: true,
     defaultValue: content,
     onCancel: function onCancel() {
       field.editable = false;
@@ -126,7 +129,7 @@ export var MarkdownVoid = observer(function (props) {
       return onSubmit;
     }()
   })) : /*#__PURE__*/React.createElement("div", {
-    className: 'nb-markdown',
+    className: cls(['nb-markdown', className]),
     dangerouslySetInnerHTML: {
       __html: markdown(content)
     }

package/es/schema-component/antd/radio/Radio.js

@@ -24,7 +24,8 @@ Radio.Group = connect(AntdRadio.Group, mapProps({
   }).map(function (option, key) {
     return /*#__PURE__*/React.createElement(Tag, {
       key: key,
-      color: option.color
+      color: option.color,
+      icon: option.icon
     }, option.label);
   }));
 }));

package/es/schema-component/antd/select/ReadPretty.js

@@ -30,7 +30,8 @@ export var ReadPretty = observer(function (props) {
   return /*#__PURE__*/React.createElement("div", null, options.map(function (option, key) {
     return /*#__PURE__*/React.createElement(Tag, {
       key: key,
-      color: option[fieldNames.color]
+      color: option[fieldNames.color],
+      icon: option.icon
     }, option[fieldNames.label]);
   }));
 });

package/es/schema-component/antd/table-v2/TableSelectorDesigner.js

@@ -14,6 +14,7 @@ import { useCollectionFilterOptions, useSortFields } from '../../../collection-m
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useSchemaTemplate } from '../../../schema-templates';
 import { useDesignable } from '../../hooks';
+import { cloneDeep } from 'lodash';
 export var TableSelectorDesigner = function TableSelectorDesigner() {
   var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3, _field$decoratorProps, _field$decoratorProps2;
 
@@ -27,7 +28,8 @@ export var TableSelectorDesigner = function TableSelectorDesigner() {
   var sortFields = useSortFields(name);
 
   var _useTableSelectorCont = useTableSelectorContext(),
-      service = _useTableSelectorCont.service;
+      service = _useTableSelectorCont.service,
+      extraFilter = _useTableSelectorCont.extraFilter;
 
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
@@ -75,8 +77,20 @@ export var TableSelectorDesigner = function TableSelectorDesigner() {
       params.filter = filter;
       field.decoratorProps.params = params;
       fieldSchema['x-decorator-props']['params'] = params;
+      var serviceFilter = cloneDeep(filter);
+
+      if (extraFilter) {
+        if (serviceFilter) {
+          serviceFilter = {
+            $and: [extraFilter, serviceFilter]
+          };
+        } else {
+          serviceFilter = extraFilter;
+        }
+      }
+
       service.run(_objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
-        filter: filter,
+        filter: serviceFilter,
         page: 1
       }));
       dn.emit('patch', {

package/es/schema-component/antd/upload/Upload.js

@@ -232,9 +232,10 @@ Upload.Attachment = connect(function (props) {
   }));
 }, mapReadPretty(ReadPretty.Attachment));
 Upload.Dragger = connect(function (props) {
+  var tipContent = props.tipContent;
   return /*#__PURE__*/React.createElement("div", {
     className: usePrefixCls('upload-dragger')
-  }, /*#__PURE__*/React.createElement(AntdUpload.Dragger, _objectSpread({}, useUploadProps(props))));
+  }, /*#__PURE__*/React.createElement(AntdUpload.Dragger, _objectSpread({}, useUploadProps(props)), tipContent, props.children));
 }, mapProps({
   value: 'fileList'
 }));

package/es/schema-component/antd/upload/shared.js

@@ -24,7 +24,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-import { useField, useForm } from '@formily/react';
+import { useField } from '@formily/react';
 import { reaction } from '@formily/reactive';
 import { isArr, isValid, toArr as toArray } from '@formily/shared';
 import { useEffect } from 'react';
@@ -197,9 +197,11 @@ export function useUploadProps(_ref) {
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, normalizeFileList(_toConsumableArray(param.fileList)));
   };
 
-  var form = useForm();
   var api = useAPIClient();
   return _objectSpread(_objectSpread({}, props), {}, {
+    // in customRequest method can't modify form's status(e.g: form.disabled=true )
+    // that will be trigger Upload component（actual Underlying is AjaxUploader component ）'s  componentWillUnmount method
+    // which will cause multiple files upload fail
     customRequest: function customRequest(_ref2) {
       var action = _ref2.action,
           data = _ref2.data,
@@ -219,7 +221,6 @@ export function useUploadProps(_ref) {
       }
 
       formData.append(filename, file);
-      form.disabled = true;
       api.axios.post(action, formData, {
         withCredentials: withCredentials,
         headers: headers,
@@ -233,9 +234,7 @@ export function useUploadProps(_ref) {
       }).then(function (_ref4) {
         var data = _ref4.data;
         onSuccess(data, file);
-      }).catch(onError).finally(function () {
-        form.disabled = false;
-      });
+      }).catch(onError).finally(function () {});
       return {
         abort: function abort() {
           console.log('upload progress is aborted.');

package/es/schema-component/antd/upload/type.d.ts

@@ -12,6 +12,8 @@ export type UploadProps = Omit<AntdUploadProps, 'onChange'> & {
 export type DraggerProps = Omit<AntdDraggerProps, 'onChange'> & {
   onChange?: (fileList: UploadFile[]) => void;
   serviceErrorMessage?: string;
+  tipContent?: string | React.ReactNode;
+  children?: React.ReactNode;
 };
 
 export type ComposedUpload = React.FC<UploadProps> & {

package/es/schema-initializer/buttons/BulkEditFormItemInitializers.d.ts

@@ -0,0 +1 @@
+export declare const BulkEditFormItemInitializers: (props: any) => JSX.Element;

package/es/schema-initializer/buttons/BulkEditFormItemInitializers.js

@@ -0,0 +1,50 @@
+import { union } from 'lodash';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { SchemaInitializer } from '../SchemaInitializer';
+import { gridRowColWrap, useAssociatedFormItemInitializerFields, useCustomBulkEditFormItemInitializerFields } from '../utils';
+export var BulkEditFormItemInitializers = function BulkEditFormItemInitializers(props) {
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  var insertPosition = props.insertPosition,
+      component = props.component;
+  var associationFields = useAssociatedFormItemInitializerFields({
+    readPretty: true,
+    block: 'Form'
+  });
+  return /*#__PURE__*/React.createElement(SchemaInitializer.Button, {
+    wrap: gridRowColWrap,
+    icon: 'SettingOutlined',
+    items: union([{
+      type: 'itemGroup',
+      title: t('Display fields'),
+      children: useCustomBulkEditFormItemInitializerFields()
+    }], associationFields.length > 0 ? [{
+      type: 'divider'
+    }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    }] : [], [{
+      type: 'divider'
+    }, {
+      type: 'item',
+      title: t('Add text'),
+      component: 'BlockInitializer',
+      schema: {
+        type: 'void',
+        'x-editable': false,
+        'x-decorator': 'FormItem',
+        'x-designer': 'Markdown.Void.Designer',
+        'x-component': 'Markdown.Void',
+        'x-component-props': {
+          content: t('This is a demo text, **supports Markdown syntax**.')
+        }
+      }
+    }]),
+    insertPosition: insertPosition,
+    component: component,
+    title: component ? null : t('Configure fields')
+  });
+};

package/es/schema-initializer/buttons/CreateFormBulkEditBlockInitializers.d.ts

@@ -0,0 +1 @@
+export declare const CreateFormBulkEditBlockInitializers: (props: any) => JSX.Element;

package/es/schema-initializer/buttons/CreateFormBulkEditBlockInitializers.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { SchemaInitializer } from '../..';
+import { gridRowColWrap } from '../utils';
+export var CreateFormBulkEditBlockInitializers = function CreateFormBulkEditBlockInitializers(props) {
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  var insertPosition = props.insertPosition,
+      component = props.component;
+  return /*#__PURE__*/React.createElement(SchemaInitializer.Button, {
+    wrap: gridRowColWrap,
+    title: component ? null : t('Add block'),
+    icon: 'PlusOutlined',
+    insertPosition: insertPosition,
+    component: component,
+    items: [{
+      type: 'itemGroup',
+      title: '{{t("Data blocks")}}',
+      children: [{
+        type: 'item',
+        title: '{{t("Form")}}',
+        component: 'CreateFormBulkEditBlockInitializer'
+      }]
+    }, {
+      type: 'itemGroup',
+      title: '{{t("Other blocks")}}',
+      children: [{
+        type: 'item',
+        title: '{{t("Markdown")}}',
+        component: 'MarkdownBlockInitializer'
+      }]
+    }]
+  });
+};

package/es/schema-initializer/buttons/FormActionInitializers.d.ts

@@ -394,3 +394,135 @@ export declare const UpdateFormActionInitializers: {
         })[];
     })[];
 };
+export declare const BulkEditFormActionInitializers: {
+    title: string;
+    icon: string;
+    items: ({
+        type: string;
+        title: string;
+        children: {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                'x-action-settings': {};
+            };
+        }[];
+    } | {
+        type: string;
+        title?: undefined;
+        children?: undefined;
+    } | {
+        type: string;
+        title: string;
+        children: ({
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                type: string;
+                title: string;
+                'x-action': string;
+                'x-designer': string;
+                'x-component': string;
+                'x-component-props': {
+                    openMode: string;
+                    useProps?: undefined;
+                };
+                properties: {
+                    drawer: {
+                        type: string;
+                        title: string;
+                        'x-component': string;
+                        'x-component-props': {
+                            className: string;
+                        };
+                        properties: {
+                            tabs: {
+                                type: string;
+                                'x-component': string;
+                                'x-component-props': {};
+                                'x-initializer': string;
+                                properties: {
+                                    tab1: {
+                                        type: string;
+                                        title: string;
+                                        'x-component': string;
+                                        'x-designer': string;
+                                        'x-component-props': {};
+                                        properties: {
+                                            grid: {
+                                                type: string;
+                                                'x-component': string;
+                                                'x-initializer': string;
+                                                properties: {};
+                                            };
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                'x-designer-props'?: undefined;
+                'x-action-settings'?: undefined;
+            };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                title: string;
+                'x-component': string;
+                'x-action': string;
+                'x-designer': string;
+                'x-designer-props': {
+                    modalTip: string;
+                };
+                'x-action-settings': {
+                    assignedValues: {};
+                    skipValidator: boolean;
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                    requestSettings?: undefined;
+                };
+                'x-component-props': {
+                    useProps: string;
+                    openMode?: undefined;
+                };
+                type?: undefined;
+                properties?: undefined;
+            };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                title: string;
+                'x-component': string;
+                'x-action': string;
+                'x-designer': string;
+                'x-action-settings': {
+                    requestSettings: {};
+                    skipValidator: boolean;
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                    assignedValues?: undefined;
+                };
+                'x-component-props': {
+                    useProps: string;
+                    openMode?: undefined;
+                };
+                type?: undefined;
+                properties?: undefined;
+                'x-designer-props'?: undefined;
+            };
+        })[];
+    })[];
+};

package/es/schema-initializer/buttons/FormActionInitializers.js

@@ -352,4 +352,122 @@ export var UpdateFormActionInitializers = {
       }
     }]
   }]
+};
+export var BulkEditFormActionInitializers = {
+  title: '{{t("Configure actions")}}',
+  icon: 'SettingOutlined',
+  items: [{
+    type: 'itemGroup',
+    title: '{{t("Enable actions")}}',
+    children: [{
+      type: 'item',
+      title: '{{t("Submit")}}',
+      component: 'BulkEditSubmitActionInitializer',
+      schema: {
+        'x-action-settings': {}
+      }
+    }]
+  }, {
+    type: 'divider'
+  }, {
+    type: 'subMenu',
+    title: '{{t("Customize")}}',
+    children: [{
+      type: 'item',
+      title: '{{t("Popup")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        type: 'void',
+        title: '{{ t("Popup") }}',
+        'x-action': 'customize:popup',
+        'x-designer': 'Action.Designer',
+        'x-component': 'Action',
+        'x-component-props': {
+          openMode: 'drawer'
+        },
+        properties: {
+          drawer: {
+            type: 'void',
+            title: '{{ t("Popup") }}',
+            'x-component': 'Action.Container',
+            'x-component-props': {
+              className: 'nb-action-popup'
+            },
+            properties: {
+              tabs: {
+                type: 'void',
+                'x-component': 'Tabs',
+                'x-component-props': {},
+                'x-initializer': 'TabPaneInitializers',
+                properties: {
+                  tab1: {
+                    type: 'void',
+                    title: '{{t("Details")}}',
+                    'x-component': 'Tabs.TabPane',
+                    'x-designer': 'Tabs.Designer',
+                    'x-component-props': {},
+                    properties: {
+                      grid: {
+                        type: 'void',
+                        'x-component': 'Grid',
+                        'x-initializer': 'RecordBlockInitializers',
+                        properties: {}
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }, {
+      type: 'item',
+      title: '{{t("Save record")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        title: '{{ t("Save") }}',
+        'x-component': 'Action',
+        'x-action': 'customize:save',
+        'x-designer': 'Action.Designer',
+        'x-designer-props': {
+          modalTip: '{{ t("When the button is clicked, the following fields will be assigned and saved together with the fields in the form. If there are overlapping fields, the value here will overwrite the value in the form.") }}'
+        },
+        'x-action-settings': {
+          assignedValues: {},
+          skipValidator: false,
+          onSuccess: {
+            manualClose: true,
+            redirecting: false,
+            successMessage: '{{t("Saved successfully")}}'
+          }
+        },
+        'x-component-props': {
+          useProps: '{{ useUpdateActionProps }}'
+        }
+      }
+    }, {
+      type: 'item',
+      title: '{{t("Custom request")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        title: '{{ t("Custom request") }}',
+        'x-component': 'Action',
+        'x-action': 'customize:form:request',
+        'x-designer': 'Action.Designer',
+        'x-action-settings': {
+          requestSettings: {},
+          skipValidator: false,
+          onSuccess: {
+            manualClose: false,
+            redirecting: false,
+            successMessage: '{{t("Request success")}}'
+          }
+        },
+        'x-component-props': {
+          useProps: '{{ useCustomizeRequestActionProps }}'
+        }
+      }
+    }]
+  }]
 };

package/es/schema-initializer/buttons/TabPaneInitializers.d.ts

@@ -1,2 +1,3 @@
 export declare const TabPaneInitializers: (props?: any) => JSX.Element;
 export declare const TabPaneInitializersForCreateFormBlock: () => JSX.Element;
+export declare const TabPaneInitializersForBulkEditFormBlock: () => JSX.Element;

package/es/schema-initializer/buttons/TabPaneInitializers.js

@@ -18,6 +18,14 @@ export var TabPaneInitializers = function TabPaneInitializers(props) {
     var form = useForm();
     var ctx = useActionContext();
     var index = useRecordIndex();
+    var initializer = 'RecordBlockInitializers';
+
+    if (props.isCreate || index === null) {
+      initializer = 'CreateFormBlockInitializers';
+    } else if (props.isBulkEdit) {
+      initializer = 'CreateFormBulkEditBlockInitializers';
+    }
+
     return {
       run: function run() {
         return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -156,4 +164,9 @@ export var TabPaneInitializersForCreateFormBlock = function TabPaneInitializersF
   return /*#__PURE__*/React.createElement(TabPaneInitializers, {
     isCreate: true
   });
+};
+export var TabPaneInitializersForBulkEditFormBlock = function TabPaneInitializersForBulkEditFormBlock() {
+  return /*#__PURE__*/React.createElement(TabPaneInitializers, {
+    isBulkEdit: true
+  });
 };

package/es/schema-initializer/buttons/TableActionInitializers.d.ts

@@ -4,7 +4,7 @@ export declare const TableActionInitializers: {
     style: {
         marginLeft: number;
     };
-    items: {
+    items: ({
         type: string;
         title: string;
         children: ({
@@ -28,5 +28,59 @@ export declare const TableActionInitializers: {
                 };
             };
         })[];
-    }[];
+    } | {
+        type: string;
+        title?: undefined;
+        children?: undefined;
+    } | {
+        type: string;
+        title: string;
+        children: ({
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                type: string;
+                title: string;
+                'x-component': string;
+                'x-align': string;
+                'x-decorator': string;
+                'x-acl-action-props': {
+                    skipScopeCheck: boolean;
+                };
+                'x-action': string;
+                'x-designer': string;
+                'x-action-settings': {
+                    assignedValues: {};
+                    updateMode: string;
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                };
+                'x-component-props': {
+                    useProps: string;
+                };
+            };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                'x-align': string;
+                'x-decorator': string;
+                'x-acl-action-props': {
+                    skipScopeCheck: boolean;
+                };
+                type?: undefined;
+                title?: undefined;
+                'x-component'?: undefined;
+                'x-action'?: undefined;
+                'x-designer'?: undefined;
+                'x-action-settings'?: undefined;
+                'x-component-props'?: undefined;
+            };
+        })[];
+    })[];
 };