@nocobase/client 0.9.0-alpha.2 → 0.9.1-alpha.2

package/es/collection-manager/action-hooks.js

@@ -180,10 +180,22 @@ export var useSortFields = function useSortFields(collectionName) {
     };
   });
 };
-export var useCollectionFilterOptions = function useCollectionFilterOptions(collectionName) {
+export var useChildrenCollections = function useChildrenCollections(collectionName) {
   var _useCollectionManager2 = useCollectionManager(),
-      getCollectionFields = _useCollectionManager2.getCollectionFields,
-      getInterface = _useCollectionManager2.getInterface;
+      getChildrenCollections = _useCollectionManager2.getChildrenCollections;
+
+  var childrenCollections = getChildrenCollections(collectionName);
+  return childrenCollections.map(function (collection) {
+    return {
+      value: collection.name,
+      label: (collection === null || collection === void 0 ? void 0 : collection.title) || collection.name
+    };
+  });
+};
+export var useCollectionFilterOptions = function useCollectionFilterOptions(collectionName) {
+  var _useCollectionManager3 = useCollectionManager(),
+      getCollectionFields = _useCollectionManager3.getCollectionFields,
+      getInterface = _useCollectionManager3.getInterface;
 
   var fields = getCollectionFields(collectionName);
 
@@ -597,8 +609,8 @@ export var useCreateActionAndRefreshCM = function useCreateActionAndRefreshCM()
   var _useCreateAction = useCreateAction(),
       _run3 = _useCreateAction.run;
 
-  var _useCollectionManager3 = useCollectionManager(),
-      refreshCM = _useCollectionManager3.refreshCM;
+  var _useCollectionManager4 = useCollectionManager(),
+      refreshCM = _useCollectionManager4.refreshCM;
 
   return {
     run: function run() {
@@ -628,8 +640,8 @@ export var useUpdateActionAndRefreshCM = function useUpdateActionAndRefreshCM()
   var _useUpdateAction = useUpdateAction(),
       _run4 = _useUpdateAction.run;
 
-  var _useCollectionManager4 = useCollectionManager(),
-      refreshCM = _useCollectionManager4.refreshCM;
+  var _useCollectionManager5 = useCollectionManager(),
+      refreshCM = _useCollectionManager5.refreshCM;
 
   return {
     run: function run() {
@@ -659,8 +671,8 @@ export var useDestroyActionAndRefreshCM = function useDestroyActionAndRefreshCM(
   var _useDestroyAction = useDestroyAction(),
       _run5 = _useDestroyAction.run;
 
-  var _useCollectionManager5 = useCollectionManager(),
-      refreshCM = _useCollectionManager5.refreshCM;
+  var _useCollectionManager6 = useCollectionManager(),
+      refreshCM = _useCollectionManager6.refreshCM;
 
   return {
     run: function run() {
@@ -690,8 +702,8 @@ export var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRe
   var _useBulkDestroyAction = useBulkDestroyAction(),
       _run6 = _useBulkDestroyAction.run;
 
-  var _useCollectionManager6 = useCollectionManager(),
-      refreshCM = _useCollectionManager6.refreshCM;
+  var _useCollectionManager7 = useCollectionManager(),
+      refreshCM = _useCollectionManager7.refreshCM;
 
   return {
     run: function run() {
@@ -718,6 +730,8 @@ export var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRe
   };
 };
 export var useFilterActionProps = function useFilterActionProps() {
+  var _service$state, _service$state$params;
+
   var _useResourceContext8 = useResourceContext(),
       collection = _useResourceContext8.collection;
 
@@ -725,7 +739,7 @@ export var useFilterActionProps = function useFilterActionProps() {
   var service = useResourceActionContext();
   return useFilterFieldProps({
     options: options,
-    params: service.params,
+    params: ((_service$state = service.state) === null || _service$state === void 0 ? void 0 : (_service$state$params = _service$state.params) === null || _service$state$params === void 0 ? void 0 : _service$state$params[0]) || service.params,
     service: service
   });
 };

package/es/collection-manager/context.d.ts

@@ -3,3 +3,7 @@ import { CollectionFieldOptions, CollectionManagerOptions, CollectionOptions } f
 export declare const CollectionManagerContext: import("react").Context<CollectionManagerOptions>;
 export declare const CollectionContext: import("react").Context<CollectionOptions>;
 export declare const CollectionFieldContext: import("react").Context<CollectionFieldOptions>;
+export declare const CollectionCategroriesContext: import("react").Context<{
+    data: any[];
+    refresh: () => void;
+}>;

package/es/collection-manager/context.js

@@ -4,4 +4,8 @@ export var CollectionManagerContext = /*#__PURE__*/createContext({
   interfaces: {}
 });
 export var CollectionContext = /*#__PURE__*/createContext({});
-export var CollectionFieldContext = /*#__PURE__*/createContext({});
+export var CollectionFieldContext = /*#__PURE__*/createContext({});
+export var CollectionCategroriesContext = /*#__PURE__*/createContext({
+  data: [],
+  refresh: function refresh() {}
+});

package/es/collection-manager/hooks/useCollectionManager.d.ts

@@ -10,6 +10,13 @@ export declare const useCollectionManager: () => {
     getInheritedFields: (name: any) => any[];
     getCollectionField: (name: string) => CollectionFieldOptions;
     getCollectionFields: (name: string) => CollectionFieldOptions[];
+    getCollectionFieldsOptions: (collectionName: string, type?: string | string[], opts?: {
+        /**
+         * 为 true 时允许查询所有关联字段
+         * 为 Array<string> 时仅允许查询指定的关联字段
+         */
+        association?: boolean | string[];
+    }) => any[];
     getCurrentCollectionFields: (name: string) => any;
     getCollection(name: any): any;
     getCollectionJoinField(name: string): any;

package/es/collection-manager/hooks/useCollectionManager.js

@@ -15,8 +15,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { clone } from '@formily/shared';
-import { reduce, unionBy, uniq } from 'lodash';
+import { reduce, unionBy, uniq, uniqBy } from 'lodash';
 import { useContext } from 'react';
+import { useCompile } from '../../schema-component';
 import { CollectionManagerContext } from '../context';
 export var useCollectionManager = function useCollectionManager() {
   var _useContext = useContext(CollectionManagerContext),
@@ -26,6 +27,8 @@ export var useCollectionManager = function useCollectionManager() {
       collections = _useContext.collections,
       templates = _useContext.templates;
 
+  var compile = useCompile();
+
   var getInheritedFields = function getInheritedFields(name) {
     var inheritKeys = getInheritCollections(name);
     var inheritedFields = reduce(inheritKeys, function (result, value) {
@@ -104,9 +107,9 @@ export var useCollectionManager = function useCollectionManager() {
   };
 
   var getChildrenCollections = function getChildrenCollections(name) {
-    var childrens = [];
+    var children = [];
 
-    var getChildrens = function getChildrens(name) {
+    var getChildren = function getChildren(name) {
       var inheritCollections = collections.filter(function (v) {
         var _v$inherits;
 
@@ -114,13 +117,13 @@ export var useCollectionManager = function useCollectionManager() {
       });
       inheritCollections.forEach(function (v) {
         var collectionKey = v.name;
-        childrens.push(v);
-        return getChildrens(collectionKey);
+        children.push(v);
+        return getChildren(collectionKey);
       });
-      return childrens;
+      return uniqBy(children, 'key');
     };
 
-    return getChildrens(name);
+    return getChildren(name);
   };
 
   var getCurrentCollectionFields = function getCurrentCollectionFields(name) {
@@ -130,6 +133,47 @@ export var useCollectionManager = function useCollectionManager() {
     return (collection === null || collection === void 0 ? void 0 : collection.fields) || [];
   };
 
+  var getCollectionFieldsOptions = function getCollectionFieldsOptions(collectionName) {
+    var _fields$filter;
+
+    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'string';
+    var opts = arguments.length > 2 ? arguments[2] : undefined;
+
+    var _ref = opts || {},
+        _ref$association = _ref.association,
+        association = _ref$association === void 0 ? false : _ref$association;
+
+    if (typeof type === 'string') {
+      type = [type];
+    }
+
+    var fields = getCollectionFields(collectionName);
+    var options = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
+      return field.interface && (type.includes(field.type) || (association && field.target && field.target !== collectionName && Array.isArray(association) ? association.includes(field.interface) : false));
+    })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
+      var _field$uiSchema;
+
+      var result = {
+        value: field.name,
+        label: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name
+      };
+
+      if (association && field.target) {
+        var _result$children;
+
+        result.children = getCollectionFieldsOptions(field.target, type, opts);
+
+        if (!((_result$children = result.children) === null || _result$children === void 0 ? void 0 : _result$children.length)) {
+          return null;
+        }
+      }
+
+      return result;
+    }) // 过滤 map 产生为 null 的数据
+    .filter(Boolean);
+    return options;
+  };
+
   return {
     service: service,
     interfaces: interfaces,
@@ -147,6 +191,7 @@ export var useCollectionManager = function useCollectionManager() {
     getInheritedFields: getInheritedFields,
     getCollectionField: getCollectionField,
     getCollectionFields: getCollectionFields,
+    getCollectionFieldsOptions: getCollectionFieldsOptions,
     getCurrentCollectionFields: getCurrentCollectionFields,
     getCollection: function getCollection(name) {
       if (typeof name !== 'string') {

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

@@ -195,7 +195,7 @@ export var m2m = {
                   'x-decorator': 'FormItem',
                   'x-component': 'Input',
                   'x-validator': 'uid',
-                  'x-disabled': '{{ !createOnly }}'
+                  'x-disabled': '{{ !createOnly||override }}'
                 }
               }
             },
@@ -228,7 +228,7 @@ export var m2m = {
                   'x-decorator': 'FormItem',
                   'x-component': 'Input',
                   'x-validator': 'uid',
-                  'x-disabled': '{{ !createOnly }}'
+                  'x-disabled': '{{ !createOnly||override }}'
                 }
               }
             },

package/es/collection-manager/interfaces/properties/index.d.ts

@@ -46,62 +46,6 @@ export declare const defaultProps: {
         'x-validator': string;
         description: string;
     };
-    type: import("@formily/react").Stringify<{
-        [key: symbol]: any;
-        [key: `x-${string}`]: any;
-        [key: `x-${number}`]: any;
-        version?: string;
-        name?: import("@formily/react").SchemaKey;
-        title?: any;
-        description?: any;
-        default?: any;
-        readOnly?: boolean;
-        writeOnly?: boolean;
-        type?: import("@formily/react").SchemaTypes;
-        enum?: import("@formily/react").SchemaEnum<any>;
-        const?: any;
-        multipleOf?: number;
-        maximum?: number;
-        exclusiveMaximum?: number;
-        minimum?: number;
-        exclusiveMinimum?: number;
-        maxLength?: number;
-        minLength?: number;
-        pattern?: string | RegExp;
-        maxItems?: number;
-        minItems?: number;
-        uniqueItems?: boolean;
-        maxProperties?: number;
-        minProperties?: number;
-        required?: string | boolean | string[];
-        format?: string;
-        $ref?: string;
-        $namespace?: string;
-        definitions?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-        properties?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-        items?: import("@formily/react").SchemaItems<any, any, any, any, any, any, any, any>;
-        additionalItems?: import("@formily/react").Stringify<any>;
-        patternProperties?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-        additionalProperties?: import("@formily/react").Stringify<any>;
-        "x-value"?: any;
-        "x-index"?: number;
-        "x-pattern"?: any;
-        "x-display"?: any;
-        "x-validator"?: any;
-        "x-decorator"?: any;
-        "x-decorator-props"?: any;
-        "x-component"?: any;
-        "x-component-props"?: any;
-        "x-reactions"?: import("@formily/react").SchemaReactions<any>;
-        "x-content"?: any;
-        "x-data"?: any;
-        "x-visible"?: boolean;
-        "x-hidden"?: boolean;
-        "x-disabled"?: boolean;
-        "x-editable"?: boolean;
-        "x-read-only"?: boolean;
-        "x-read-pretty"?: boolean;
-    }>;
 };
 export declare const recordPickerSelector: ISchema;
 export declare const recordPickerViewer: {

package/es/collection-manager/interfaces/properties/index.js

@@ -370,8 +370,7 @@ export var defaultProps = {
     'x-component': 'Input',
     'x-validator': 'uid',
     description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
-  },
-  type: type
+  }
 };
 export var recordPickerSelector = {
   type: 'void',

package/es/collection-manager/templates/calendar.js

@@ -40,5 +40,5 @@ export var calendar = {
   availableFieldInterfaces: {
     include: []
   },
-  configurableProperties: getConfigurableProperties('title', 'name', 'inherits')
+  configurableProperties: getConfigurableProperties('title', 'name', 'inherits', 'category')
 };

package/es/collection-manager/templates/general.js

@@ -7,5 +7,5 @@ export var general = {
   default: {
     fields: []
   },
-  configurableProperties: getConfigurableProperties('title', 'name', 'inherits', 'moreOptions')
+  configurableProperties: getConfigurableProperties('title', 'name', 'inherits', 'category', 'moreOptions')
 };

package/es/collection-manager/templates/properties/index.d.ts

@@ -169,6 +169,17 @@ export declare const defaultConfigurableProperties: {
         'x-visible': string;
         'x-reactions': string[];
     };
+    category: {
+        title: string;
+        type: string;
+        name: string;
+        'x-decorator': string;
+        'x-component': string;
+        'x-component-props': {
+            mode: string;
+        };
+        'x-reactions': string[];
+    };
 };
-export declare type DefaultConfigurableKeys = 'name' | 'title' | 'inherits' | 'autoGenId' | 'createdBy' | 'updatedBy' | 'createdAt' | 'updatedAt' | 'sortable' | 'moreOptions';
+export declare type DefaultConfigurableKeys = 'name' | 'title' | 'inherits' | 'category' | 'autoGenId' | 'createdBy' | 'updatedBy' | 'createdAt' | 'updatedAt' | 'sortable' | 'moreOptions';
 export declare const getConfigurableProperties: (...keys: DefaultConfigurableKeys[]) => {};

package/es/collection-manager/templates/properties/index.js

@@ -106,6 +106,17 @@ export var defaultConfigurableProperties = _objectSpread(_objectSpread({
     'x-disabled': '{{ !createOnly }}',
     'x-visible': '{{ enableInherits}}',
     'x-reactions': ['{{useAsyncDataSource(loadCollections)}}']
+  },
+  category: {
+    title: '{{t("Categories")}}',
+    type: 'hasMany',
+    name: 'category',
+    'x-decorator': 'FormItem',
+    'x-component': 'Select',
+    'x-component-props': {
+      mode: 'multiple'
+    },
+    'x-reactions': ['{{useAsyncDataSource(loadCategories)}}']
   }
 }, moreOptions), {}, {
   moreOptions: {

package/es/i18n/i18n.js

@@ -23,7 +23,9 @@ i18n // .use(Backend)
   //   return key;
   // },
   // ns: ['client'],
-  resources: {}
+  resources: {},
+  keySeparator: false,
+  nsSeparator: false
 });
 i18n.on('languageChanged', function (lng) {
   localStorage.setItem('NOCOBASE_LOCALE', lng);

package/es/locale/en_US.d.ts

@@ -34,6 +34,29 @@ declare const _default: {
     "UI editor": string;
     Collection: string;
     "Collections & Fields": string;
+    "All collections": string;
+    "Add category": string;
+    "Delete category": string;
+    "Edit category": string;
+    "Collection category": string;
+    Sort: string;
+    Categories: string;
+    Visible: string;
+    "Read only": string;
+    "Easy reading": string;
+    Hidden: string;
+    "Hidden(reserved value)": string;
+    "Not required": string;
+    Value: string;
+    Disabled: string;
+    Enabled: string;
+    "Linkage rule": string;
+    "Linkage rules": string;
+    Condition: string;
+    Properties: string;
+    "Add linkage rule": string;
+    "Add property": string;
+    "Category name": string;
     "Roles & Permissions": string;
     "Edit profile": string;
     "Change password": string;

package/es/locale/en_US.js

@@ -34,6 +34,29 @@ export default {
   "UI editor": "UI editor",
   "Collection": "Collection",
   "Collections & Fields": "Collections & Fields",
+  "All collections": "All collections",
+  "Add category": "Add category",
+  "Delete category": "Delete category",
+  "Edit category": "Edit category",
+  "Collection category": "Collection category",
+  "Sort": "Sort",
+  "Categories": "Categories",
+  "Visible": "Visible",
+  "Read only": "Read only",
+  "Easy reading": "Easy reading",
+  "Hidden": "Hidden",
+  "Hidden(reserved value)": "Hidden(reserved value)",
+  "Not required": "Not required",
+  "Value": "Value",
+  "Disabled": "Disabled",
+  "Enabled": "Enabled",
+  "Linkage rule": "Linkage rule",
+  "Linkage rules": "Linkage rules",
+  "Condition": "Condition",
+  "Properties": "Properties",
+  "Add linkage rule": "Add linkage rule",
+  "Add property": "Add property",
+  "Category name": "Category name",
   "Roles & Permissions": "Roles & Permissions",
   "Edit profile": "Edit profile",
   "Change password": "Change password",

package/es/locale/ja_JP.d.ts

@@ -34,6 +34,29 @@ declare const _default: {
     "UI editor": string;
     Collection: string;
     "Collections & Fields": string;
+    "All collections": string;
+    "Add category": string;
+    "Edit category": string;
+    Sort: string;
+    Categories: string;
+    "Category name": string;
+    "Delete category": string;
+    "Collection category": string;
+    Visible: string;
+    "Read only": string;
+    "Easy reading": string;
+    Hidden: string;
+    "Hidden(reserved value)": string;
+    "Not required": string;
+    Value: string;
+    Disabled: string;
+    Enabled: string;
+    "Linkage rule": string;
+    "Linkage rules": string;
+    Condition: string;
+    Properties: string;
+    "Add linkage rule": string;
+    "Add property": string;
     "Roles & Permissions": string;
     "Edit profile": string;
     "Change password": string;

package/es/locale/ja_JP.js

@@ -34,6 +34,29 @@ export default {
   "UI editor": "UI エディタ",
   "Collection": "コレクション",
   "Collections & Fields": "コレクションとフィールド",
+  "All collections": "すべてのデータテーブル",
+  "Add category": "分類の追加",
+  "Edit category": "分類の編集",
+  "Sort": "ソート＃ソート＃",
+  "Categories": "データテーブルカテゴリ",
+  "Category name": "分類名",
+  "Delete category": "分類の削除",
+  "Collection category": "Collection category",
+  "Visible": "表示",
+  "Read only": "読み取り専用(編集不可)",
+  "Easy reading": "読み取り専用(読取りモード)",
+  "Hidden": "非表示",
+  "Hidden(reserved value)": "非表示(値の保持)",
+  "Not required": "必須ではありません",
+  "Value": "フィールド値",
+  "Disabled": "無効化",
+  "Enabled": "有効化",
+  "Linkage rule": "連動規則",
+  "Linkage rules": "連動規則",
+  "Condition": "条件＃ジョウケン＃",
+  "Properties": "属性＃ゾクセイ＃",
+  "Add linkage rule": "連動規則の追加",
+  "Add property": "属性の追加",
   "Roles & Permissions": "役割と権限",
   "Edit profile": "プロフィール",
   "Change password": "パスワード変更",
@@ -369,7 +392,7 @@ export default {
   "Role UID": "役割ID",
   "Precision": "精度",
   "Formula mode": "数式モード",
-  "Expression": "表示",
+  "Expression": "表达式",
   "Input +, -, *, /, ( ) to calculate, input @ to open field variables.": "+、-、*、/、( ) で算術演算、@でフィールド変数を開くことができます。",
   "Formula error.": "式の検証エラーです。",
   "Accept": "ファイル形式",

package/es/locale/ru_RU.d.ts

@@ -107,6 +107,7 @@ declare const _default: {
     "Create collection": string;
     "Collection display name": string;
     "Collection name": string;
+    Categories: string;
     "Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.": string;
     "Storage type": string;
     Edit: string;

package/es/locale/ru_RU.js

@@ -107,6 +107,7 @@ export default {
   "Create collection": "Создать Коллекцию",
   "Collection display name": "Отображение имени Коллекции",
   "Collection name": "Имя Коллекции",
+  "Categories": "Категории таблиц данных",
   "Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.": "Случайно сгенерированный и может быть изменен. Поддерживает буквы, цифры и подчеркивания, должно начинаться с буквы.",
   "Storage type": "Тип Хранилища",
   "Edit": "Изменить",

package/es/locale/zh_CN.d.ts

@@ -34,6 +34,30 @@ declare const _default: {
     "UI editor": string;
     Collection: string;
     "Collections & Fields": string;
+    "All collections": string;
+    "Add category": string;
+    "Delete category": string;
+    "Edit category": string;
+    "Collection category": string;
+    Visible: string;
+    "Read only": string;
+    "Easy reading": string;
+    Hidden: string;
+    "Hidden(reserved value)": string;
+    "Not required": string;
+    Value: string;
+    Disabled: string;
+    Enabled: string;
+    "Linkage rule": string;
+    "Linkage rules": string;
+    Condition: string;
+    Properties: string;
+    "Add linkage rule": string;
+    "Add property": string;
+    Expression: string;
+    Sort: string;
+    Categories: string;
+    "Category name": string;
     "Roles & Permissions": string;
     "Edit profile": string;
     "Change password": string;
@@ -127,6 +151,7 @@ declare const _default: {
     "General collection": string;
     "Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.": string;
     "Storage type": string;
+    "Types will be used in database": string;
     Edit: string;
     "Edit collection": string;
     "Configure fields": string;
@@ -146,15 +171,22 @@ declare const _default: {
     "Long text": string;
     Phone: string;
     Email: string;
+    Null: string;
+    Boolean: string;
     Number: string;
     Integer: string;
     Percent: string;
+    String: string;
     Password: string;
     "Advanced type": string;
     Formula: string;
     "Formula description": string;
+    "Syntax references": string;
+    "Math.js comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types": string;
+    "Formula.js supports most Microsoft Excel formula functions.": string;
     Choices: string;
     Checkbox: string;
+    "Display <icon></icon> when unchecked": string;
     "Single select": string;
     "Multiple select": string;
     "Radio group": string;
@@ -435,10 +467,6 @@ declare const _default: {
     '\u2264': string;
     'Role UID': string;
     Precision: string;
-    'Formula mode': string;
-    Expression: string;
-    'Input +, -, *, /, ( ) to calculate, input @ to open field variables.': string;
-    'Formula error.': string;
     Accept: string;
     'Rich Text': string;
     'Junction collection': string;
@@ -593,5 +621,16 @@ declare const _default: {
     'Fix block': string;
     'Plugin name': string;
     'Plugin tab name': string;
+    'Enable page header': string;
+    'Display page title': string;
+    'Edit page title': string;
+    'Enable page tabs': string;
+    'Column width': string;
+    Sortable: string;
+    Constant: string;
+    'Use variable': string;
+    True: string;
+    False: string;
+    Prettify: string;
 };
 export default _default;