@steedos/standard-object-database 2.7.1-beta.16 → 2.7.1-beta.18

package/main/default/objectTranslations/object_functions.en/object_functions.en.objectTranslation.yml

@@ -49,6 +49,10 @@ fields:
     options:
       - label: "Script"
         value: "script"
+  description:
+    label: Description
+    help:
+    description:
 listviews:
   all:
     label: All

package/main/default/objectTranslations/object_functions.zh-CN/object_functions.zh-CN.objectTranslation.yml

@@ -46,6 +46,10 @@ fields:
     options:
       - label: "Script"
         value: "script"
+  description:
+    label: 备注
+    help:
+    description:
 listviews:
   all:
     label: 所有

package/main/default/objects/datasources/fields/driver.field.yml

@@ -6,3 +6,4 @@ options: >-
   Server:sqlserver,PostgreSQL:postgres,Oracle:oracle,MySQL:mysql,Sqlite:sqlite
 required: true
 sort_no: 100
+filterable: true

package/main/default/objects/datasources/fields/is_enable.field.yml

@@ -2,3 +2,4 @@ name: is_enable
 type: boolean
 label: Enable
 sort_no: 250
+filterable: true

package/main/default/objects/datasources/fields/label.field.yml

@@ -4,3 +4,5 @@ label: Label
 required: true
 is_name: true
 sort_no: 110
+filterable: true
+searchable: true

package/main/default/objects/datasources/fields/name.field.yml

@@ -9,3 +9,4 @@ inlineHelpText: >-
   cannot end with an underscore character or contain two consecutive underscore
   characters
 sort_no: 120
+filterable: true

package/main/default/objects/object_fields/fields/is_name.field.yml

@@ -6,4 +6,4 @@ hidden: false
 label: Is Name
 sort_no: 650
 type: boolean
-visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup'], item => item === type) && !multiple}
+visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup', 'master_detail'], item => item === type) && !multiple}

package/main/default/objects/object_fields/fields/summary_filters.field.yml

@@ -13,4 +13,4 @@ is_wide: true
 label: Filter Criteria
 sort_no: 280
 type: table
-visible_on: '{{formData.type === ''summary'' && global.mode !=''read'' ? true: false}}'
+visible_on: '{{formData.type === ''summary''}}'

package/main/default/objects/object_functions/fields/description.field.yml

@@ -0,0 +1,5 @@
+name: description
+label: Description
+type: textarea
+sort_no: 200
+is_wide: true

package/main/default/objects/object_functions/fields/script.field.yml

@@ -9,13 +9,13 @@ defaultValue: |-
   // objects
   // ctx.input
 editorDidMount: >-
-  if(window._registerCompletionItemProviderTrigger){
+  if(window._registerCompletionItemProviderFunction){
     return ;
   }
 
-  window._registerCompletionItemProviderTrigger = true;
+  window._registerCompletionItemProviderFunction = true;
 
-  const result = Steedos.authRequest("/service/api/suggestions/trigger.d.ts",
+  const result = Steedos.authRequest("/service/api/suggestions/function.d.ts",
   {async: false});
 
   monaco.languages.typescript.javascriptDefaults.addExtraLib(

package/main/default/objects/object_triggers/fields/_name.field.yml

@@ -5,3 +5,4 @@ searchable: true
 index: true
 required: true
 sort_no: 100
+filterable: true

package/main/default/objects/object_triggers/fields/isEnabled.field.yml

@@ -3,3 +3,4 @@ label: Enabled
 type: boolean
 defaultValue: true
 sort_no: 140
+filterable: true

package/main/default/objects/object_triggers/fields/listenTo.field.yml

@@ -5,3 +5,4 @@ reference_to: objects
 reference_to_field: name
 required: true
 sort_no: 120
+filterable: true

package/main/default/objects/object_triggers/fields/name.field.yml

@@ -3,3 +3,4 @@ data_type: text
 type: text
 visible_on: '{{false}}'
 sort_no: 110
+filterable: true

package/main/default/objects/object_triggers/fields/when.field.yml

@@ -20,3 +20,4 @@ options:
   - label: 查询记录之前
     value: beforeFind
 sort_no: 130
+filterable: true

package/main/default/objects/object_validation_rules/fields/active.field.yml

@@ -5,3 +5,4 @@ inlineHelpText: >-
   Indicates whether this validation rule is active, (true), or not active
   (false).
 sort_no: 120
+filterable: true

package/main/default/objects/object_validation_rules/fields/description.field.yml

@@ -3,3 +3,4 @@ type: textarea
 is_wide: true
 label: description
 sort_no: 130
+filterable: true

package/main/default/objects/object_validation_rules/fields/name.field.yml

@@ -3,3 +3,5 @@ type: text
 label: Name
 required: true
 sort_no: 100
+filterable: true
+searchable: true

package/main/default/objects/object_validation_rules/fields/object_name.field.yml

@@ -6,3 +6,4 @@ write_requires_master_read: true
 reference_to_field: name
 required: true
 sort_no: 110
+filterable: true

package/main/default/objects/object_webhooks/fields/event.field.yml

@@ -12,4 +12,5 @@ options:
   - label: 记录已创建或已更新
     value: createAndUpdate
   - label: 记录已删除
-    value: delete
+    value: delete
+filterable: true

package/main/default/objects/object_webhooks/fields/execute_when.field.yml

@@ -9,4 +9,5 @@ options:
   - label: 每次更新记录并满足条件要求
     value: trueEveryTime
   - label: 仅在更新记录以满足条件要求时
-    value: trueOnChangeOnly
+    value: trueOnChangeOnly
+filterable: true

package/main/default/objects/object_webhooks/fields/name.field.yml

@@ -2,4 +2,6 @@ name: name
 type: text
 label: Name
 required: true
-sort_no: 10
+sort_no: 10
+filterable: true
+searchable: true

package/main/default/objects/object_webhooks/fields/object_name.field.yml

@@ -5,4 +5,6 @@ reference_to_field: name
 label: Object
 required: true
 index: true
-sort_no: 20
+sort_no: 20
+searchable: true
+filterable: true

package/main/default/objects/object_webhooks/fields/payload_url.field.yml

@@ -4,4 +4,6 @@ type: text
 is_wide: true
 # regEx: /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i
 required: true
-sort_no: 70
+sort_no: 70
+filterable: true
+searchable: true

package/main/default/objects/objects/fields/description.field.yml

@@ -4,3 +4,4 @@ is_wide: true
 label: Description
 sort_no: 50
 type: textarea
+filterable: true

package/main/default/objects/objects/fields/in_development.field.yml

@@ -13,3 +13,5 @@ options:
 required: true
 sort_no: 40
 type: select
+filterable: true
+

package/main/default/objects/objects/fields/is_customize.field.yml

@@ -4,3 +4,4 @@ label: 是否自定义
 readonly: true
 sort_no: 100
 type: boolean
+filterable: true

package/main/default/objects/objects/fields/is_system.field.yml

@@ -6,3 +6,4 @@ readonly: true
 sort_no: 110
 type: boolean
 visible_on: '{{global.mode ===''read'' ? true : false}}'
+filterable: true

package/main/default/server/object_fields.object.js

@@ -299,7 +299,7 @@ function allowChangeObject(){
 }
 
 function checkNameField(nameField){
-  if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup"].indexOf(nameField.type) < 0){
+  if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup", "master_detail"].indexOf(nameField.type) < 0){
     throw new Error("只有文本、长文本、自动编号、日期、日期时间、时间、公式、相关表这些类型的字段可以被设置为名称字段");
   } else if(nameField.type == "lookup" && nameField.multiple) {
     throw new Error("多选的相关表字段不可以被设置为名称字段");

package/main/default/services/suggestions.service.js

@@ -129,6 +129,98 @@ module.exports = {
                     ${servicesTypes}
                 `
             }
+        },
+        functionTSExtraLib: {
+            rest: {
+                method: "GET",
+                path: "/function.d.ts",
+            },
+            async handler(ctx) {
+                let objectsTypes = 'declare const objects: {';
+                _.each(global.objects, (v, k)=>{
+                    objectsTypes = `${objectsTypes} ${k}: SteedosObjectType;`
+                });
+
+                objectsTypes = objectsTypes + '}'
+
+                return `
+                    
+                    declare var global = {_: any, moment: any, validator: any, filters: any};
+
+                    declare type Params = {
+                        userId: SteedosIDType;
+                        spaceId?: SteedosIDType;
+                    }
+
+                    declare type CTXType = {
+                        input: any;
+                        params: Params;
+                        broker: {
+                            meta: any;
+                            call: any;
+                            mcall: any;
+                            emit: any;
+                            broadcast: any;
+                            broadcastLocal: any;
+                            namespace: string;
+                            nodeID: string;
+                            instanceID: string;
+                            logger: any;
+                            metadata: any;
+                        },
+                        getObject(objectName: string): SteedosObjectType;
+                        getUser(userId: string, spaceId: string): Promise<SteedosUserSession>;
+                    };
+
+                    declare var ctx: CTXType;
+
+                    declare type SteedosQueryFilters = any;
+                    declare type SteedosIDType = number | string;
+                    declare type SteedosQueryOptions = {
+                        fields?: Array<string> | string;
+                        readonly filters?: SteedosQueryFilters;
+                        readonly top?: number;
+                        readonly skip?: number;
+                        readonly sort?: string;
+                    };
+                    declare type SteedosUserSession = {
+                        userId: SteedosIDType;
+                        spaceId?: string;
+                        name: string;
+                        username?: string;
+                        mobile?: string;
+                        email?: string;
+                        utcOffset?: number;
+                        locale?: string;
+                        roles?: string[];
+                        space?: any;
+                        spaces?: any;
+                        company?: any;
+                        companies?: any;
+                        organization?: any;
+                        organizations?: any;
+                        permission_shares?: any;
+                        company_id?: string;
+                        company_ids?: string[];
+                        is_space_admin?: boolean;
+                        steedos_id?: string;
+                    };
+                    declare class SteedosObjectType {
+                        find(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        findOne(id: SteedosIDType, query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        insert(doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        update(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        delete(id: SteedosIDType, userSession?: SteedosUserSession): Promise<any>;
+                        directFind(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        directInsert(doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        directUpdate(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        directDelete(id: SteedosIDType, userSession?: SteedosUserSession): Promise<any>;
+                        count(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        _makeNewID(): Promise<any>;
+                    }
+                    ${objectsTypes}
+                `
+            }
         }
 	},
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.1-beta.16",
+    "version": "2.7.1-beta.18",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,14 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.1-beta.16",
-        "@steedos/service-object-mixin": "2.7.1-beta.16",
-        "@steedos/standard-objects": "2.7.1-beta.16",
+        "@steedos/metadata-core": "2.7.1-beta.18",
+        "@steedos/service-object-mixin": "2.7.1-beta.18",
+        "@steedos/standard-objects": "2.7.1-beta.18",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "ab56517f48e72f56687af564a3c93f4f29d02e1f"
+    "gitHead": "c2fa4bb0bf8837b4099f7dbb3f9319f0e1a35311"
 }