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

package/es/{workflow/nodes/update.js → collection-manager/interfaces/integer.js}

@@ -4,26 +4,30 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-import { useCollectionDataSource } from '../..';
-import { CollectionFieldset, VariableComponent } from '../calculators';
-import { collection, filter, values } from '../schemas/collection';
-export default {
-  title: '{{t("Update record")}}',
-  type: 'update',
-  group: 'collection',
-  fieldset: {
-    'config.collection': collection,
-    'config.params.filter': _objectSpread(_objectSpread({}, filter), {}, {
-      title: '{{t("Only update records matching conditions")}}'
-    }),
-    'config.params.values': values
+import { defaultProps, operators } from './properties';
+export var integer = {
+  name: 'integer',
+  type: 'object',
+  group: 'basic',
+  order: 5,
+  title: '{{t("Integer")}}',
+  sortable: true,
+  default: {
+    type: 'integer',
+    // name,
+    uiSchema: {
+      type: 'number',
+      // title,
+      'x-component': 'InputNumber',
+      'x-component-props': {
+        stringMode: true,
+        step: '0'
+      },
+      'x-validator': 'integer'
+    }
   },
-  view: {},
-  scope: {
-    useCollectionDataSource: useCollectionDataSource
-  },
-  components: {
-    VariableComponent: VariableComponent,
-    CollectionFieldset: CollectionFieldset
+  properties: _objectSpread({}, defaultProps),
+  filterable: {
+    operators: operators.number
   }
 };

package/es/collection-manager/interfaces/linkTo.js

@@ -49,16 +49,24 @@ export var linkTo = {
     }
   },
   schemaInitialize: function schemaInitialize(schema, _ref) {
-    var readPretty = _ref.readPretty;
+    var readPretty = _ref.readPretty,
+        block = _ref.block;
 
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
+    if (block === 'Form') {
       schema['properties'] = {
+        viewer: cloneDeep(recordPickerViewer),
         selector: cloneDeep(recordPickerSelector)
       };
+    } else {
+      if (readPretty) {
+        schema['properties'] = {
+          viewer: cloneDeep(recordPickerViewer)
+        };
+      } else {
+        schema['properties'] = {
+          selector: cloneDeep(recordPickerSelector)
+        };
+      }
     }
   },
   initialize: function initialize(values) {

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

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

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

@@ -1,3 +1,5 @@
+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; }
+
 import { cloneDeep } from 'lodash';
 import { recordPickerSelector, recordPickerViewer, relationshipType } from './properties';
 export var m2o = {
@@ -42,17 +44,66 @@ export 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: cloneDeep(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: cloneDeep(recordPickerSelector)
-      };
+      schema.type = 'string';
+
+      if (block === 'Form') {
+        schema['properties'] = {
+          viewer: cloneDeep(recordPickerViewer),
+          selector: cloneDeep(recordPickerSelector)
+        };
+      } else {
+        if (readPretty) {
+          schema['properties'] = {
+            viewer: cloneDeep(recordPickerViewer)
+          };
+        } else {
+          schema['properties'] = {
+            selector: cloneDeep(recordPickerSelector)
+          };
+        }
+      }
     }
 
     if (['Table', 'Kanban'].includes(block)) {

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

@@ -1,6 +1,7 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { relationshipType } from './properties';
+import { cloneDeep } from 'lodash';
+import { recordPickerSelector, recordPickerViewer, relationshipType } from './properties';
 export var o2m = {
   name: 'o2m',
   type: 'object',
@@ -14,13 +15,14 @@ export 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: {
@@ -43,46 +45,69 @@ export 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: cloneDeep(recordPickerViewer),
+          selector: cloneDeep(recordPickerSelector)
+        };
+      } else {
+        if (readPretty) {
+          schema['properties'] = {
+            viewer: cloneDeep(recordPickerViewer)
+          };
+        } else {
+          schema['properties'] = {
+            selector: cloneDeep(recordPickerSelector)
+          };
+        }
       }
-    }; // if (readPretty) {
+    } // if (readPretty) {
     //   schema['properties'] = {
     //     viewer: cloneDeep(recordPickerViewer),
     //   };
@@ -92,6 +117,7 @@ export var o2m = {
     //   };
     // }
 
+
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

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

@@ -1,5 +1,72 @@
+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; }
+
 import { cloneDeep } from 'lodash';
 import { recordPickerSelector, recordPickerViewer, relationshipType } from './properties';
+
+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: cloneDeep(recordPickerViewer),
+        selector: cloneDeep(recordPickerSelector)
+      };
+    } else {
+      if (readPretty) {
+        schema['properties'] = {
+          viewer: cloneDeep(recordPickerViewer)
+        };
+      } else {
+        schema['properties'] = {
+          selector: cloneDeep(recordPickerSelector)
+        };
+      }
+    }
+  }
+};
+
 export var o2o = {
   name: 'o2o',
   type: 'object',
@@ -42,19 +109,17 @@ export var o2o = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref) {
-    var readPretty = _ref.readPretty,
-        block = _ref.block;
-
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(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'] || {};
@@ -214,19 +279,17 @@ export var oho = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref2) {
-    var readPretty = _ref2.readPretty,
-        block = _ref2.block;
-
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(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'] || {};
@@ -385,19 +448,17 @@ export var obo = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref3) {
-    var readPretty = _ref3.readPretty,
-        block = _ref3.block;
-
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(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'] || {};

package/es/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/es/collection-manager/interfaces/properties/operators.js

@@ -129,6 +129,13 @@ export 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/es/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/es/index.js

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

package/es/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/es/locale/en_US.js

@@ -79,7 +79,7 @@ export 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",
@@ -120,6 +120,7 @@ export default {
   "Phone": "Phone",
   "Email": "Email",
   "Number": "Number",
+  "Integer": "Integer",
   "Percent": "Percent",
   "Password": "Password",
   "Formula": "Formula",
@@ -176,6 +177,7 @@ export 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",
@@ -541,5 +543,10 @@ export 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"
 };

package/es/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;