@nocobase/client 0.7.1-alpha.7 → 0.7.2-alpha.3

package/lib/collection-manager/interfaces/m2m.js

@@ -62,14 +62,21 @@ var m2m = {
     var readPretty = _ref.readPretty,
         block = _ref.block;
 
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-      };
-    } else {
+    if (block === 'Form') {
       schema['properties'] = {
+        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer),
         selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
       };
+    } else {
+      if (readPretty) {
+        schema['properties'] = {
+          viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
+        };
+      } else {
+        schema['properties'] = {
+          selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
+        };
+      }
     }
 
     if (['Table', 'Kanban'].includes(block)) {

package/lib/collection-manager/interfaces/m2o.js

@@ -7,7 +7,9 @@ exports.m2o = void 0;
 
 var _lodash = require("lodash");
 
-var _properties = require("./properties");
+var _properties2 = require("./properties");
+
+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; }
 
 var m2o = {
   name: 'm2o',
@@ -51,17 +53,66 @@ var m2o = {
     }
   },
   schemaInitialize: function schemaInitialize(schema, _ref) {
-    var readPretty = _ref.readPretty,
-        block = _ref.block;
+    var field = _ref.field,
+        block = _ref.block,
+        readPretty = _ref.readPretty,
+        action = _ref.action;
 
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
+    if (block === 'Form' && schema['x-component'] === 'FormField') {
+      var association = "".concat(field.collectionName, ".").concat(field.name);
+      schema.type = 'void';
+      schema.properties = {
+        block: {
+          type: 'void',
+          'x-decorator': 'FormFieldProvider',
+          'x-decorator-props': {
+            collection: field.target,
+            association: association,
+            resource: association,
+            action: action,
+            fieldName: field.name,
+            readPretty: readPretty
+          },
+          'x-component': 'CardItem',
+          'x-component-props': {
+            bordered: true
+          },
+          properties: _defineProperty({}, field.name, {
+            type: 'object',
+            'x-component': 'FormV2',
+            'x-component-props': {
+              useProps: '{{ useFormFieldProps }}'
+            },
+            properties: {
+              __form_grid: {
+                type: 'void',
+                'x-component': 'Grid',
+                'x-initializer': 'FormItemInitializers',
+                properties: {}
+              }
+            }
+          })
+        }
       };
     } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-      };
+      schema.type = 'string';
+
+      if (block === 'Form') {
+        schema['properties'] = {
+          viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer),
+          selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
+        };
+      } else {
+        if (readPretty) {
+          schema['properties'] = {
+            viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer)
+          };
+        } else {
+          schema['properties'] = {
+            selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
+          };
+        }
+      }
     }
 
     if (['Table', 'Kanban'].includes(block)) {
@@ -86,7 +137,7 @@ var m2o = {
       'x-component': 'Input',
       description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
     },
-    type: _properties.relationshipType,
+    type: _properties2.relationshipType,
     grid: {
       type: 'void',
       'x-component': 'Grid',

package/lib/collection-manager/interfaces/o2m.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.o2m = void 0;
 
+var _lodash = require("lodash");
+
 var _properties2 = require("./properties");
 
 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; }
@@ -22,13 +24,14 @@ var o2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'TableField',
-      'x-component-props': {// mode: 'tags',
-        // multiple: true,
-        // fieldNames: {
-        //   label: 'id',
-        //   value: 'id',
-        // },
+      'x-component': 'RecordPicker',
+      'x-component-props': {
+        // mode: 'tags',
+        multiple: true,
+        fieldNames: {
+          label: 'id',
+          value: 'id'
+        }
       }
     },
     reverseField: {
@@ -51,46 +54,69 @@ var o2m = {
   },
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var field = _ref.field,
-        readPretty = _ref.readPretty,
-        block = _ref.block;
-    var association = "".concat(field.collectionName, ".").concat(field.name);
-    schema['type'] = 'void';
-    schema['x-component'] = 'TableField';
-    schema['properties'] = {
-      block: {
-        type: 'void',
-        'x-decorator': 'TableFieldProvider',
-        'x-decorator-props': {
-          collection: field.target,
-          association: association,
-          resource: association,
-          action: 'list',
-          params: {
-            paginate: false
-          },
-          showIndex: true,
-          dragSort: false
-        },
-        properties: _defineProperty({
-          actions: {
-            type: 'void',
-            'x-initializer': 'SubTableActionInitializers',
-            'x-component': 'TableField.ActionBar',
-            'x-component-props': {}
-          }
-        }, field.name, {
-          type: 'array',
-          'x-initializer': 'TableColumnInitializers',
-          'x-component': 'TableV2',
-          'x-component-props': {
-            rowSelection: {
-              type: 'checkbox'
+        block = _ref.block,
+        readPretty = _ref.readPretty;
+
+    if (block === 'Form' && schema['x-component'] === 'TableField') {
+      var association = "".concat(field.collectionName, ".").concat(field.name);
+      schema['type'] = 'void';
+      schema['properties'] = {
+        block: {
+          type: 'void',
+          'x-decorator': 'TableFieldProvider',
+          'x-decorator-props': {
+            collection: field.target,
+            association: association,
+            resource: association,
+            action: 'list',
+            params: {
+              paginate: false
             },
-            useProps: '{{ useTableFieldProps }}'
-          }
-        })
+            showIndex: true,
+            dragSort: false,
+            fieldName: field.name
+          },
+          properties: _defineProperty({
+            actions: {
+              type: 'void',
+              'x-initializer': 'SubTableActionInitializers',
+              'x-component': 'TableField.ActionBar',
+              'x-component-props': {}
+            }
+          }, field.name, {
+            type: 'array',
+            'x-initializer': 'TableColumnInitializers',
+            'x-component': 'TableV2',
+            'x-component-props': {
+              rowSelection: {
+                type: 'checkbox'
+              },
+              useProps: '{{ useTableFieldProps }}'
+            }
+          })
+        }
+      };
+    } else {
+      schema['x-component'] = 'CollectionField';
+      schema.type = 'object';
+
+      if (block === 'Form') {
+        schema['properties'] = {
+          viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer),
+          selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
+        };
+      } else {
+        if (readPretty) {
+          schema['properties'] = {
+            viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer)
+          };
+        } else {
+          schema['properties'] = {
+            selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
+          };
+        }
       }
-    }; // if (readPretty) {
+    } // if (readPretty) {
     //   schema['properties'] = {
     //     viewer: cloneDeep(recordPickerViewer),
     //   };
@@ -100,6 +126,7 @@ var o2m = {
     //   };
     // }
 
+
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

package/lib/collection-manager/interfaces/o2o.js

@@ -7,7 +7,73 @@ exports.oho = exports.obo = exports.o2o = void 0;
 
 var _lodash = require("lodash");
 
-var _properties = require("./properties");
+var _properties2 = require("./properties");
+
+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; }
+
+var internalSchameInitialize = function internalSchameInitialize(schema, _ref) {
+  var field = _ref.field,
+      block = _ref.block,
+      readPretty = _ref.readPretty,
+      action = _ref.action;
+
+  if (block === 'Form' && schema['x-component'] === 'FormField') {
+    var association = "".concat(field.collectionName, ".").concat(field.name);
+    schema.type = 'void';
+    schema.properties = {
+      block: {
+        type: 'void',
+        'x-decorator': 'FormFieldProvider',
+        'x-decorator-props': {
+          collection: field.target,
+          association: association,
+          resource: association,
+          action: action,
+          fieldName: field.name,
+          readPretty: readPretty
+        },
+        'x-component': 'CardItem',
+        'x-component-props': {
+          bordered: true
+        },
+        properties: _defineProperty({}, field.name, {
+          type: 'object',
+          'x-component': 'FormV2',
+          'x-component-props': {
+            useProps: '{{ useFormFieldProps }}'
+          },
+          properties: {
+            __form_grid: {
+              type: 'void',
+              'x-component': 'Grid',
+              'x-initializer': 'FormItemInitializers',
+              properties: {}
+            }
+          }
+        })
+      }
+    };
+  } else {
+    schema.type = 'string';
+
+    if (block === 'Form') {
+      schema['properties'] = {
+        viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer),
+        selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
+      };
+    } else {
+      if (readPretty) {
+        schema['properties'] = {
+          viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer)
+        };
+      } else {
+        schema['properties'] = {
+          selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
+        };
+      }
+    }
+  }
+};
 
 var o2o = {
   name: 'o2o',
@@ -51,19 +117,17 @@ var o2o = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref) {
-    var readPretty = _ref.readPretty,
-        block = _ref.block;
-
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-      };
-    }
+  schemaInitialize: function schemaInitialize(schema, _ref2) {
+    var field = _ref2.field,
+        block = _ref2.block,
+        readPretty = _ref2.readPretty,
+        action = _ref2.action;
+    internalSchameInitialize(schema, {
+      field: field,
+      block: block,
+      readPretty: readPretty,
+      action: action
+    });
 
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
@@ -87,7 +151,7 @@ var o2o = {
       'x-component': 'Input',
       description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
     },
-    type: _properties.relationshipType,
+    type: _properties2.relationshipType,
     grid: {
       type: 'void',
       'x-component': 'Grid',
@@ -224,19 +288,17 @@ var oho = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref2) {
-    var readPretty = _ref2.readPretty,
-        block = _ref2.block;
-
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-      };
-    }
+  schemaInitialize: function schemaInitialize(schema, _ref3) {
+    var field = _ref3.field,
+        block = _ref3.block,
+        readPretty = _ref3.readPretty,
+        action = _ref3.action;
+    internalSchameInitialize(schema, {
+      field: field,
+      block: block,
+      readPretty: readPretty,
+      action: action
+    });
 
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
@@ -260,7 +322,7 @@ var oho = {
       'x-component': 'Input',
       description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
     },
-    type: _properties.relationshipType,
+    type: _properties2.relationshipType,
     grid: {
       type: 'void',
       'x-component': 'Grid',
@@ -396,19 +458,17 @@ var obo = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref3) {
-    var readPretty = _ref3.readPretty,
-        block = _ref3.block;
-
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-      };
-    }
+  schemaInitialize: function schemaInitialize(schema, _ref4) {
+    var field = _ref4.field,
+        block = _ref4.block,
+        readPretty = _ref4.readPretty,
+        action = _ref4.action;
+    internalSchameInitialize(schema, {
+      field: field,
+      block: block,
+      readPretty: readPretty,
+      action: action
+    });
 
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
@@ -432,7 +492,7 @@ var obo = {
       'x-component': 'Input',
       description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
     },
-    type: _properties.relationshipType,
+    type: _properties2.relationshipType,
     grid: {
       type: 'void',
       'x-component': 'Grid',

package/lib/collection-manager/interfaces/properties/operators.d.ts

@@ -79,10 +79,21 @@ export declare const id: ({
     label: string;
     value: string;
     selected: boolean;
+    schema?: undefined;
+    noValue?: undefined;
+} | {
+    label: string;
+    value: string;
+    selected?: undefined;
+    schema?: undefined;
     noValue?: undefined;
 } | {
     label: string;
     value: string;
+    schema: {
+        'x-component': string;
+        'x-component-props': {};
+    };
     selected?: undefined;
     noValue?: undefined;
 } | {
@@ -91,11 +102,13 @@ export declare const id: ({
     noValue: boolean;
     visible(field: any): boolean;
     selected?: undefined;
+    schema?: undefined;
 } | {
     label: string;
     value: string;
     noValue: boolean;
     selected?: undefined;
+    schema?: undefined;
 })[];
 export declare const enumType: ({
     label: string;

package/lib/collection-manager/interfaces/properties/operators.js

@@ -139,6 +139,13 @@ var id = [{
 }, {
   label: '{{t("is not")}}',
   value: '$ne'
+}, {
+  label: '{{t("is variable")}}',
+  value: '$isVar',
+  schema: {
+    'x-component': 'VariableCascader',
+    'x-component-props': {}
+  }
 }, {
   label: '{{t("is current logged-in user")}}',
   value: '$isCurrentUser',

package/lib/index.d.ts

@@ -24,4 +24,3 @@ export * from './schema-templates';
 export * from './settings-form';
 export * from './system-settings';
 export * from './user';
-export * from './workflow';

package/lib/index.js

@@ -318,17 +318,4 @@ Object.keys(_user).forEach(function (key) {
       return _user[key];
     }
   });
-});
-
-var _workflow = require("./workflow");
-
-Object.keys(_workflow).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _workflow[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _workflow[key];
-    }
-  });
 });

package/lib/locale/en_US.d.ts

@@ -120,6 +120,7 @@ declare const _default: {
     Phone: string;
     Email: string;
     Number: string;
+    Integer: string;
     Percent: string;
     Password: string;
     Formula: string;
@@ -176,6 +177,7 @@ declare const _default: {
     "Add filter group": string;
     is: string;
     "is not": string;
+    "is variable": string;
     contains: string;
     "does not contain": string;
     "starts with": string;
@@ -541,6 +543,11 @@ declare const _default: {
     "One to one (has one)": string;
     "One to one (belongs to)": string;
     "Use the same time zone (GMT) for all users": string;
+    "Block title": string;
+    "Edit block title": string;
     "Province/city/area name": string;
+    "Field component": string;
+    Subtable: string;
+    Subform: string;
 };
 export default _default;

package/lib/locale/en_US.js

@@ -85,7 +85,7 @@ var _default = {
   "Add new": "Add new",
   "Add record": "Add record",
   "Custom field display name": "Custom field display name",
-  "Display fields": "Display fields",
+  "Display fields": "Display collection fields",
   "Edit record": "Edit record",
   "Delete menu item": "Delete menu item",
   "Add page": "Add page",
@@ -126,6 +126,7 @@ var _default = {
   "Phone": "Phone",
   "Email": "Email",
   "Number": "Number",
+  "Integer": "Integer",
   "Percent": "Percent",
   "Password": "Password",
   "Formula": "Formula",
@@ -182,6 +183,7 @@ var _default = {
   "Add filter group": "Add filter group",
   "is": "is",
   "is not": "is not",
+  "is variable": "is variable",
   "contains": "contains",
   "does not contain": "does not contain",
   "starts with": "starts with",
@@ -547,6 +549,11 @@ var _default = {
   "One to one (has one)": "One to one (has one)",
   "One to one (belongs to)": "One to one (belongs to)",
   "Use the same time zone (GMT) for all users": "Use the same time zone (GMT) for all users",
-  "Province/city/area name": "Province/city/area name"
+  "Block title": "Block title",
+  "Edit block title": "Edit block title",
+  "Province/city/area name": "Province/city/area name",
+  "Field component": "Field component",
+  "Subtable": "Subtable",
+  "Subform": "Subform"
 };
 exports.default = _default;

package/lib/locale/zh_CN.d.ts

@@ -120,6 +120,7 @@ declare const _default: {
     Phone: string;
     Email: string;
     Number: string;
+    Integer: string;
     Percent: string;
     Password: string;
     Formula: string;
@@ -173,7 +174,11 @@ declare const _default: {
     "Many to one description": string;
     "Many to many description": string;
     "Generated automatically if left blank": string;
-    "References fields of associated table": string;
+    "Display association fields": string;
+    "Field component": string;
+    Subtable: string;
+    Subform: string;
+    "Record picker": string;
     "Toggles the subfield mode": string;
     "Selector mode": string;
     "Subtable mode": string;
@@ -189,6 +194,7 @@ declare const _default: {
     "Add filter group": string;
     is: string;
     "is not": string;
+    "is variable": string;
     contains: string;
     "does not contain": string;
     "starts with": string;
@@ -500,10 +506,13 @@ declare const _default: {
     'Branch into "Yes" and "No"': string;
     Conditions: string;
     'Parallel branch': string;
+    'Add branch': string;
     'All succeeded': string;
     'Any succeeded': string;
+    'Any succeeded or failed': string;
     'Continue after all branches succeeded': string;
     'Continue after any branch succeeded': string;
+    'Continue after any branch succeeded, or exit after any branch failed': string;
     Delay: string;
     Duration: string;
     'End Status': string;