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

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

@@ -108,6 +108,19 @@ Object.keys(_email).forEach(function (key) {
   });
 });
 
+var _formula = require("./formula");
+
+Object.keys(_formula).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _formula[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _formula[key];
+    }
+  });
+});
+
 var _icon = require("./icon");
 
 Object.keys(_icon).forEach(function (key) {
@@ -147,6 +160,19 @@ Object.keys(_input).forEach(function (key) {
   });
 });
 
+var _integer = require("./integer");
+
+Object.keys(_integer).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _integer[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _integer[key];
+    }
+  });
+});
+
 var _linkTo = require("./linkTo");
 
 Object.keys(_linkTo).forEach(function (key) {
@@ -392,17 +418,4 @@ Object.keys(_updatedBy).forEach(function (key) {
       return _updatedBy[key];
     }
   });
-});
-
-var _formula = require("./formula");
-
-Object.keys(_formula).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _formula[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _formula[key];
-    }
-  });
 });

package/lib/collection-manager/interfaces/integer.d.ts

@@ -0,0 +1,2 @@
+import { IField } from './types';
+export declare const integer: IField;

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

@@ -3,13 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.integer = void 0;
 
-var _ = require("../..");
-
-var _calculators = require("../calculators");
-
-var _collection = require("../schemas/collection");
+var _properties = require("./properties");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -17,24 +13,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; }
 
-var _default = {
-  title: '{{t("Update record")}}',
-  type: 'update',
-  group: 'collection',
-  fieldset: {
-    'config.collection': _collection.collection,
-    'config.params.filter': _objectSpread(_objectSpread({}, _collection.filter), {}, {
-      title: '{{t("Only update records matching conditions")}}'
-    }),
-    'config.params.values': _collection.values
-  },
-  view: {},
-  scope: {
-    useCollectionDataSource: _.useCollectionDataSource
+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'
+    }
   },
-  components: {
-    VariableComponent: _calculators.VariableComponent,
-    CollectionFieldset: _calculators.CollectionFieldset
+  properties: _objectSpread({}, _properties.defaultProps),
+  filterable: {
+    operators: _properties.operators.number
   }
 };
-exports.default = _default;
+exports.integer = integer;

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

@@ -59,16 +59,24 @@ var linkTo = {
     }
   },
   schemaInitialize: function schemaInitialize(schema, _ref) {
-    var readPretty = _ref.readPretty;
+    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)
+        };
+      }
     }
   },
   initialize: function initialize(values) {

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';