@nocobase/client 0.9.2-alpha.4 → 0.9.4-alpha.1

package/lib/schema-component/hooks/index.js

@@ -123,4 +123,15 @@ Object.keys(_useTableSize).forEach(function (key) {
       return _useTableSize[key];
     }
   });
+});
+var _useFieldModeOptions = require("./useFieldModeOptions");
+Object.keys(_useFieldModeOptions).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useFieldModeOptions[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _useFieldModeOptions[key];
+    }
+  });
 });

package/lib/schema-component/hooks/useFieldModeOptions.d.ts

@@ -0,0 +1,4 @@
+export declare const useFieldModeOptions: () => {
+    label: string;
+    value: string;
+}[];

package/lib/schema-component/hooks/useFieldModeOptions.js

@@ -0,0 +1,112 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFieldModeOptions = void 0;
+var _react = require("@formily/react");
+var _react2 = require("react");
+var _reactI18next = require("react-i18next");
+var _collectionManager = require("../../collection-manager");
+var useFieldModeOptions = function useFieldModeOptions() {
+  var _fieldSchema$xCompon;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getCollection = _useCollectionManager.getCollection;
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var field = (0, _react.useField)();
+  var isReadPretty = field.readPretty;
+  var _useCollection = (0, _collectionManager.useCollection)(),
+    getField = _useCollection.getField;
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+    t = _useTranslation.t;
+  var _ref = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.fieldNames) || {},
+    label = _ref.label;
+  var fieldModeOptions = (0, _react2.useMemo)(function () {
+    if (!collectionField || !(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface)) {
+      return;
+    }
+    if (!['o2o', 'oho', 'obo', 'o2m', 'linkTo', 'm2o', 'm2m'].includes(collectionField.interface)) return;
+    var collection = getCollection(collectionField.target);
+    if ((collection === null || collection === void 0 ? void 0 : collection.template) === 'file') {
+      return isReadPretty ? [{
+        label: t('Title'),
+        value: 'Select'
+      }, {
+        label: t('File manager'),
+        value: 'FileManager'
+      }] : [{
+        label: t('File manager'),
+        value: 'FileManager'
+      }, {
+        label: t('Record picker'),
+        value: 'Picker'
+      }, {
+        label: t('Select'),
+        value: 'Select'
+      }];
+    }
+    switch (collectionField.interface) {
+      case 'o2m':
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        },
+        // { label: t('Subtable'), value: 'SubTable' },
+        {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        },
+        // { label: t('Subtable'), value: 'SubTable' },
+        {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+      case 'm2o':
+      case 'm2m':
+      case 'linkTo':
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+      default:
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+    }
+  }, [t, collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface, label]);
+  return fieldModeOptions;
+};
+exports.useFieldModeOptions = useFieldModeOptions;

package/lib/schema-initializer/SchemaInitializerProvider.d.ts

@@ -6,6 +6,7 @@ export interface SchemaInitializerProviderProps {
 }
 export declare const useSchemaInitializer: (name: string, props?: {}) => {
     exists: boolean;
+    InitializerComponent: (p: any) => JSX.Element;
     render: (props?: any) => React.CElement<any, React.Component<any, any, any>>;
 };
 export declare const SchemaInitializerPluginContext: React.Context<any>;

package/lib/schema-initializer/SchemaInitializerProvider.js

@@ -31,19 +31,30 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
   var _render = function render(component, props) {
     return component && /*#__PURE__*/_react2.default.createElement(component, props);
   };
-  if (!name) {
-    return {
-      exists: false,
-      render: function render(props) {
-        return _render(null);
-      }
-    };
-  }
-  var initializer = (0, _get.default)(initializers, name || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer']));
+  var initializerPropsRef = (0, _react2.useRef)({});
+  var initializer = name ? (0, _get.default)(initializers, name || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer'])) : null;
   var initializerProps = _objectSpread(_objectSpread({}, props), fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer-props']);
+  initializerPropsRef.current = initializerProps;
+  var InitializerComponent = (0, _react2.useMemo)(function () {
+    var C = _react2.default.Fragment;
+    if (!initializer) {
+      return C;
+    } else if ((0, _shared.isPlainObj)(initializer)) {
+      C = initializer.component || _SchemaInitializer.SchemaInitializer.Button;
+      return function (p) {
+        return /*#__PURE__*/_react2.default.createElement(C, _objectSpread(_objectSpread(_objectSpread({}, initializer), initializerPropsRef.current), p));
+      };
+    } else {
+      C = initializer;
+      return function (p) {
+        return /*#__PURE__*/_react2.default.createElement(C, _objectSpread(_objectSpread({}, initializerPropsRef.current), p));
+      };
+    }
+  }, [initializer]);
   if (!initializer) {
     return {
       exists: false,
+      InitializerComponent: InitializerComponent,
       render: function render(props) {
         return _render(null);
       }
@@ -52,6 +63,7 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
   if ((0, _shared.isPlainObj)(initializer)) {
     return {
       exists: true,
+      InitializerComponent: InitializerComponent,
       render: function render(props) {
         var component = initializer.component || _SchemaInitializer.SchemaInitializer.Button;
         return _render(component, _objectSpread(_objectSpread(_objectSpread({}, initializer), initializerProps), props));
@@ -60,6 +72,7 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
   }
   return {
     exists: true,
+    InitializerComponent: InitializerComponent,
     render: function render(props) {
       return _render(initializer, _objectSpread(_objectSpread({}, initializerProps), props));
     }

package/lib/schema-initializer/buttons/BlockInitializers.js

@@ -29,6 +29,16 @@ var BlockInitializers = {
       type: 'item',
       title: '{{t("Details")}}',
       component: 'DetailsBlockInitializer'
+    }, {
+      key: 'List',
+      type: 'item',
+      title: '{{t("List")}}',
+      component: 'ListBlockInitializer'
+    }, {
+      key: 'GridCard',
+      type: 'item',
+      title: '{{t("Grid Card")}}',
+      component: 'GridCardBlockInitializer'
     }, {
       key: 'calendar',
       type: 'item',

package/lib/schema-initializer/buttons/CustomFormItemInitializers.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.CustomFormItemInitializers = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactI18next = require("react-i18next");
+var _schemaComponent = require("../../schema-component");
 var _SchemaInitializer = require("../SchemaInitializer");
 var _utils = require("../utils");
-var _schemaComponent = require("../../schema-component");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // 表单里配置字段
 var CustomFormItemInitializers = function CustomFormItemInitializers(props) {
@@ -17,7 +17,9 @@ var CustomFormItemInitializers = function CustomFormItemInitializers(props) {
   var compile = (0, _schemaComponent.useCompile)();
   var insertPosition = props.insertPosition,
     component = props.component;
-  var inheritFields = (0, _utils.useInheritsFormItemInitializerFields)();
+  var inheritFields = (0, _utils.useInheritsFormItemInitializerFields)({
+    component: 'AssignedField'
+  });
   var fieldItems = [{
     type: 'itemGroup',
     title: t('Configure fields'),

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

@@ -20,58 +20,6 @@ export declare const FormActionInitializers: {
         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;
@@ -95,10 +43,7 @@ export declare const FormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
             };
         } | {
             type: string;
@@ -121,10 +66,7 @@ export declare const FormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
                 'x-designer-props'?: undefined;
             };
         })[];
@@ -152,58 +94,6 @@ export declare const CreateFormActionInitializers: {
         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;
@@ -227,10 +117,7 @@ export declare const CreateFormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
             };
         } | {
             type: string;
@@ -253,10 +140,7 @@ export declare const CreateFormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
                 'x-designer-props'?: undefined;
             };
         })[];

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

@@ -24,56 +24,59 @@ var FormActionInitializers = {
   }, {
     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: {}
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }, {
+    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',
@@ -143,56 +146,59 @@ var CreateFormActionInitializers = {
   }, {
     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: {}
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }, {
+    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',

package/lib/schema-initializer/buttons/GanttActionInitializers.d.ts

@@ -51,27 +51,11 @@ export declare const GanttActionInitializers: {
             visible: () => boolean;
         })[];
         visible?: undefined;
-        component?: undefined;
-        schema?: undefined;
-        find?: undefined;
     } | {
         type: string;
         visible: () => boolean;
         title?: undefined;
         children?: undefined;
-        component?: undefined;
-        schema?: undefined;
-        find?: undefined;
-    } | {
-        type: string;
-        title: string;
-        component: string;
-        schema: {
-            'x-align': string;
-        };
-        find: (schema: import("@formily/json-schema").Schema<any, any, any, any, any, any, any, any, any>) => import("@formily/json-schema").Schema<any, any, any, any, any, any, any, any, any>;
-        visible: () => boolean;
-        children?: undefined;
     } | {
         type: string;
         title: string;
@@ -126,8 +110,5 @@ export declare const GanttActionInitializers: {
             };
         })[];
         visible: () => boolean;
-        component?: undefined;
-        schema?: undefined;
-        find?: undefined;
     })[];
 };