npm - @steedos/standard-object-database - Versions diffs - 2.6.1-beta.5 → 2.6.1-beta.7 - Mend

@steedos/standard-object-database 2.6.1-beta.5 → 2.6.1-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/main/default/client/object_fields.client.js CHANGED Viewed

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-05 14:17:44
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-06-09 14:42:12
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-07-24 13:57:51
  * @Description:
  */
 Steedos.ObjectFieldManager = {};
@@ -67,4 +67,40 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
     operations.push(optionals.equal, optionals.unequal);
   }
   return operations;
-};
+};
+(function () {
+  try {
+      var styleCss = $(`<style>
+          .defaultValue_field div:first-child{
+              flex-grow: 1;
+          }
+          .defaultValue_field .defaultValue_field_formula{
+              // margin: 4px;
+          }
+          .defaultValue_field .defaultValue_field_formula .antd-Form-label{
+              visibility: hidden;
+          }
+          .defaultValue_field .defaultValue_field_formula_visible{
+              flex-grow: 1;
+          }
+          .defaultValue_field .defaultValue_field_formula_visible .antd-Form-label .antd-TplField{
+              visibility: visible;
+          }
+          .defaultValue_field .defaultValue_field_hidden{
+              display: none;
+          }
+          .defaultValue_field .defaultValue_field_formula_hidden{
+              flex-grow: 0;
+          }
+          .defaultValue_field .defaultValue_field_formula_hidden .antd-FormulaPicker-input{
+              display: none;
+          }
+      </style>`);
+      $("head").append(styleCss);
+  } catch (error) {
+      console.log(error);
+  }
+})();

package/main/default/objectTranslations/object_actions.en/object_actions.en.objectTranslation.yml CHANGED Viewed

@@ -29,6 +29,25 @@ fields:
     label: 'On'
     help:
     description:
+    options:
+      - label: Display in the top right corner of the list
+        value: list
+        icon: contact_list
+      - label: Displayed in the top right corner of the record viewing page and in the drop-down menu for each item in the list view
+        value: record
+        icon: contact_list
+      - label: Displayed in the "More" dropdown menu in the upper right corner of the record viewing page, as well as in the dropdown menu for each item in the list view
+        value: record_more
+        icon: lead_list
+      - label: Display in the drop-down menu for each item in the list view
+        value: list_item
+        icon: action_list_component
+      - label: Displayed in the upper right corner of the record viewing page
+        value: record_only
+        icon: contract
+      - label: Displayed in the "More" drop-down menu in the upper right corner of the record viewing page
+        value: record_only_more
+        icon: lead_list
   type:
     label: Type
     options:

package/main/default/objectTranslations/object_actions.zh-CN/object_actions.zh-CN.objectTranslation.yml CHANGED Viewed

@@ -26,6 +26,25 @@ fields:
     label: 显示位置
     help:
     description:
+    options:
+      - label: 显示在列表右上角
+        value: list
+        icon: contact_list
+      - label: 显示在记录查看页右上角，以及列表视图中每项的下拉菜单中
+        value: record
+        icon: contact_list
+      - label: 显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中
+        value: record_more
+        icon: lead_list
+      - label: 显示在列表视图中每项的下拉菜单中
+        value: list_item
+        icon: action_list_component
+      - label: 显示在记录查看页右上角
+        value: record_only
+        icon: contract
+      - label: 显示在记录查看页右上角的“更多”下拉菜单中
+        value: record_only_more
+        icon: lead_list
   type:
     label: 类型
     options:

package/main/default/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml CHANGED Viewed

@@ -33,6 +33,8 @@ fields:
         value: html
       - label: Code
         value: code
+      - label: Markdown
+        value: markdown
       - label: Select
         value: select
       - label: Checkbox
@@ -325,6 +327,10 @@ fields:
       permission to create, edit, or delete child records. This setting is more
       restrictive than true, and is the default value.
     description:
+  amis:
+    label: Amis Attribute
+    help:
+    description:
 groups:
   external_data_source: External data source
   advanced: Advanced

package/main/default/objectTranslations/object_fields.zh-CN/object_fields.zh-CN.objectTranslation.yml CHANGED Viewed

@@ -30,6 +30,8 @@ fields:
         value: html
       - label: 代码
         value: code
+      - label: Markdown
+        value: markdown
       - label: 选择框
         value: select
       - label: 复选框
@@ -298,6 +300,10 @@ fields:
     help: >-
       设置主记录上创建、编辑或删除子记录所需的最低访问级别。此字段仅适用于·主表/子表·字段类型。勾选表示允许具有'读取'访问权限的用户创建、编辑或删除子记录。反之表示允许具有'读取/写入'访问权限的用户创建、编辑或删除子记录的权限。
     description:
+  amis:
+    label: Amis 属性
+    help:
+    description:
 groups:
   external_data_source: 外部数据源
   advanced: 高级

package/main/default/objectTranslations/object_layouts.en/object_layouts.en.objectTranslation.yml CHANGED Viewed

@@ -60,7 +60,14 @@ fields:
 listviews:
   all:
     label: All
+groups:
+  general_information: General Information
+  buttons: Buttons
+  fields: Fields
+  related_lists: Related Lists
 actions:
+  createDefaultRecordView:
+    label: Create Default Page Layout
   customize:
     label: Customize
 CustomLabels:

package/main/default/objectTranslations/object_layouts.zh-CN/object_layouts.zh-CN.objectTranslation.yml CHANGED Viewed

@@ -106,7 +106,14 @@ fields:
 listviews:
   all:
     label: 所有
+groups:
+  general_information: 基本信息
+  buttons: 按钮
+  fields: 字段
+  related_lists: 子表
 actions:
+  createDefaultRecordView:
+    label: 创建默认页面布局
   customize:
     label: 自定义
 CustomLabels:

package/main/default/objectTranslations/object_triggers.en/object_triggers.en.objectTranslation.yml CHANGED Viewed

@@ -14,6 +14,21 @@ fields:
     label: Execution Time Option
     help:
     description:
+    options:
+      - label: "Before adding a new record"
+        value: "beforeInsert"
+      - label: "After adding a new record"
+        value: "afterInsert"
+      - label: "Before modifying a record"
+        value: "beforeUpdate"
+      - label: "After modifying a record"
+        value: "afterUpdate"
+      - label: "Before deleting a record"
+        value: "beforeDelete"
+      - label: "After deleting a record"
+        value: "afterDelete"
+      - label: "Before checking the records"
+        value: "beforeFind"
   is_enable:
     label: Enable
     help:

package/main/default/objectTranslations/object_triggers.zh-CN/object_triggers.zh-CN.objectTranslation.yml CHANGED Viewed

@@ -14,6 +14,21 @@ fields:
     label: 运行时
     help:
     description:
+    options:
+      - label: "新增记录之前"
+        value: "beforeInsert"
+      - label: "新增记录之后"
+        value: "afterInsert"
+      - label: "修改记录之前"
+        value: "beforeUpdate"
+      - label: "修改记录之后"
+        value: "afterUpdate"
+      - label: "删除记录之前"
+        value: "beforeDelete"
+      - label: "删除记录之后"
+        value: "afterDelete"
+      - label: "查下记录之前"
+        value: "beforeFind"
   isEnabled:
     label: 已启用
     help:

package/main/default/objectTranslations/objects.en/objects.en.objectTranslation.yml CHANGED Viewed

@@ -212,6 +212,8 @@ actions:
     label: Preview
   copy_odata:
     label: Copy OData URL
+  createDefaultRecordView:
+    label: Create Default Page Layout
 CustomLabels:
   objects_field_datasource_defaultValue: Default data source
   objects_field_datasource_meteor: Meteor

package/main/default/objectTranslations/objects.zh-CN/objects.zh-CN.objectTranslation.yml CHANGED Viewed

@@ -209,6 +209,8 @@ actions:
     label: 预览
   copy_odata:
     label: 复制OData网址
+  createDefaultRecordView:
+    label: 创建默认页面布局
 CustomLabels:
   objects_field_datasource_defaultValue: 默认数据源
   objects_field_datasource_meteor: Meteor

package/main/default/objects/16.permission_tabs.observe.object.js ADDED Viewed

@@ -0,0 +1,44 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-06-28 16:15:36
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-06-28 18:59:40
+ * @FilePath: /project-template/Users/sunhaolin/Documents/GitHub/steedos-platform-2.3/services/standard-object-database/main/default/objects/16.permission_tabs.observe.object.js
+ * @Description:
+ */
+const objectql = require("@steedos/objectql");
+const objectName = "permission_tabs";
+const SERVICE_NAME = `~database-permission_tabs`;
+Meteor.startup(function () {
+    var _change, _remove, inited = false;
+    _change = function (document) {
+        objectql.registerPermissionTabs.register(broker, SERVICE_NAME, document)
+    };
+    _remove = function (document) {
+        objectql.registerPermissionTabs.remove(broker, SERVICE_NAME, document)
+    };
+    Creator.getCollection(objectName).find({}, {
+        fields: {
+            created: 0,
+            created_by: 0,
+            modified: 0,
+            modified_by: 0
+        }
+    }).observe({
+        added: function (newDocument) {
+            if (inited) {
+                return _change(newDocument);
+            }
+        },
+        changed: function (newDocument, oldDocument) {
+            if (newDocument.name != oldDocument.name) {
+                _remove(oldDocument)
+            }
+            return _change(newDocument);
+        },
+        removed: function (oldDocument) {
+            return _remove(oldDocument);
+        }
+    });
+    inited = true;
+});

package/main/default/objects/datasources.object.yml CHANGED Viewed

@@ -3,6 +3,7 @@ label: DataSource
 icon: entity
 hidden: true
 version: 2
+enable_dataloader: false
 fields:
   driver:
     type: select

package/main/default/objects/object_actions.action.js CHANGED Viewed

@@ -7,7 +7,7 @@
  */
 module.exports = {
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}`);
+    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
   },
   showDesignVisible: function (object_name, record_id, record_permissions) {
       var perms;

package/main/default/objects/object_actions.object.yml CHANGED Viewed

@@ -1,6 +1,7 @@
 name: object_actions
 label: Object Action
 icon: actions_and_buttons
+enable_dataloader: false
 hidden: true
 version: 2
 fields:
@@ -45,34 +46,53 @@ fields:
     required: true
     showIcon: false
     sort_no: 160
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              return [{
-                label: "显示在列表右上角",
-                value: "list",
-                icon: "contact_list"
-              }, {
-                label: "显示在记录查看页右上角，以及列表视图中每项的下拉菜单中",
-                value: "record",
-                icon: "contact_list"
-              }, {
-                label: "显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中",
-                value: "record_more",
-                icon: "lead_list"
-              }, {
-                label: "显示在列表视图中每项的下拉菜单中",
-                value: "list_item",
-                icon: "action_list_component"
-              }, {
-                label: "显示在记录查看页右上角",
-                value: "record_only",
-                icon: "contract"
-              }, {
-                label: "显示在记录查看页右上角的“更多”下拉菜单中",
-                value: "record_only_more",
-                icon: "lead_list"
-              }];
-            }
+    options:
+      - label: 显示在列表右上角
+        value: list
+        icon: contact_list
+      - label: 显示在记录查看页右上角，以及列表视图中每项的下拉菜单中
+        value: record
+        icon: contact_list
+      - label: 显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中
+        value: record_more
+        icon: lead_list
+      - label: 显示在列表视图中每项的下拉菜单中
+        value: list_item
+        icon: action_list_component
+      - label: 显示在记录查看页右上角
+        value: record_only
+        icon: contract
+      - label: 显示在记录查看页右上角的“更多”下拉菜单中
+        value: record_only_more
+        icon: lead_list
+    # optionsFunction: !<tag:yaml.org,2002:js/function> |-
+      # function () {
+      #         return [{
+      #           label: "显示在列表右上角",
+      #           value: "list",
+      #           icon: "contact_list"
+      #         }, {
+      #           label: "显示在记录查看页右上角，以及列表视图中每项的下拉菜单中",
+      #           value: "record",
+      #           icon: "contact_list"
+      #         }, {
+      #           label: "显示在记录查看页右上角的“更多”下拉菜单中，以及列表视图中每项的下拉菜单中",
+      #           value: "record_more",
+      #           icon: "lead_list"
+      #         }, {
+      #           label: "显示在列表视图中每项的下拉菜单中",
+      #           value: "list_item",
+      #           icon: "action_list_component"
+      #         }, {
+      #           label: "显示在记录查看页右上角",
+      #           value: "record_only",
+      #           icon: "contract"
+      #         }, {
+      #           label: "显示在记录查看页右上角的“更多”下拉菜单中",
+      #           value: "record_only_more",
+      #           icon: "lead_list"
+      #         }];
+      #       }
   type:
     type: select
     sort_no: 170

package/main/default/objects/object_fields.object.yml CHANGED Viewed

@@ -3,6 +3,7 @@ icon: textbox
 enable_api: true
 enable_inline_edit: false
 enable_enhanced_lookup: true
+enable_dataloader: false
 hidden: true
 label: Object Fields
 version: 2.0
@@ -202,9 +203,37 @@ fields:
     sort_no: 155
     visible_on: "{{['code'].indexOf(formData.type) > -1 ? true: false}}"
   defaultValue:
-    type: text
+    type: object
+    blackbox: true
     label: Default Value
     sort_no: 160
+    amis:
+      type: service
+      className:
+        antd-Form-item: true
+        antd-Form-item--normal: true
+        m-1: true
+        "md:border-b": global.mode === "read"
+        defaultValue_field: true
+        flex: true
+      schemaApi:
+        url: "${context.rootUrl}/service/api/object_fields/defaultValue/schema?object=${object}&name=${name}&options=${options}&type=${type}&reference_to=${reference_to}&multiple=${multiple}&filtersFunction=${filtersFunction}&reference_to_field=${reference_to_field}&mode=${global.mode}&_id=${_id}"
+        method: get
+        headers:
+          Authorization: "Bearer ${context.tenantId},${context.authToken}"
+        # sendOn: "!!this.type"
+      onEvent:
+        fetchSchemaInited:
+          weight: 0
+          actions:
+            - actionType: "setValue"
+              componentId: "service_detail_page"
+              args:
+                value:
+                  defaultValue: "${event.data.body[0].value}"
+              expression: "global.mode ==='read' && event.data.body[0].value"
   group:
     type: text
     label: Group

package/main/default/objects/object_layouts.object.yml CHANGED Viewed

@@ -3,25 +3,30 @@ label: Object Layouts
 icon: dashboard_ea
 hidden: false
 version: 2
+enable_dataloader: false
 fields:
   name:
     type: text
     required: true
     label: Api Name
     is_wide: true
+    group: general_information
   label:
     type: text
     required: true
     label: Label
     is_wide: true
     is_name: true
+    group: general_information
   object_name:
     label: Object
     type: master_detail
     required: true
     reference_to: objects
     reference_to_field: name
+    is_wide: true
     write_requires_master_read: true
+    group: general_information
   type:
     type: select
     options:
@@ -41,6 +46,10 @@ fields:
     create: false
     reference_to: permission_set
     reference_to_field: name
+    is_wide: true
+    defaultValue:
+      - admin
+      - user
     optionsFunction: !<tag:yaml.org,2002:js/function> |-
       function () {
         var profiles = Creator.odata.query('permission_set', {$filter: "(type eq 'profile')"}, true);
@@ -53,12 +62,14 @@ fields:
         });
         return result;
       }
+    group: general_information
   buttons:
     type: grid
     blackbox: true
     is_wide: true
     depend_on:
       - object_name
+    group: buttons
   buttons.$.button_name:
     type: lookup
     reference_to: object_actions
@@ -82,6 +93,7 @@ fields:
     required: true
     depend_on:
       - object_name
+    group: fields
   fields.$:
     label: Field
     blackbox: true
@@ -115,6 +127,7 @@ fields:
     is_wide: true
     depend_on:
       - object_name
+    group: related_lists
   related_lists.$.related_field_fullname:
     type: lookup
     optionsFunction: !!js/function |

package/main/default/objects/object_listviews.action.js CHANGED Viewed

@@ -92,7 +92,7 @@ module.exports = {
     return true;
   },
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}`);
+    document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
   },
   showDesignVisible: function (object_name, record_id, record_permissions) {
       var perms= {};

package/main/default/objects/object_listviews.object.js CHANGED Viewed

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-05-30 18:38:47
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-07-13 13:28:02
  * @Description:
  */
 const _ = require("underscore");
@@ -91,7 +91,7 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
     on: "server",
     when: "before.remove",
     todo: function (userId, doc) {
-      console.log("before.remove");
+      // console.log("before.remove");
       if (doc.owner !== userId) {
         throw new Meteor.Error(403, "can only remove own list view");
       }

package/main/default/objects/object_listviews.object.yml CHANGED Viewed

@@ -2,6 +2,7 @@ name: object_listviews
 label: List View
 icon: forecasts
 version: 2
+enable_dataloader: false
 fields:
   label:
     label: Label

package/main/default/objects/object_related_list.object.yml CHANGED Viewed

@@ -2,6 +2,7 @@ name: object_related_list
 label: Object Related List
 icon: related_list
 hidden: true
+enable_dataloader: false
 fields:
   object_name:
     label: To Object

package/main/default/objects/object_triggers.object.yml CHANGED Viewed

@@ -3,6 +3,7 @@ icon: apex
 label: Object Triggers
 version: 2.0
 hidden: true
+enable_dataloader: false
 fields:
   _name:
     type: text

package/main/default/objects/object_validation_rules.object.yml CHANGED Viewed

@@ -3,6 +3,7 @@ icon: textbox
 hidden: true
 label: Object Validation Rules
 version: 2
+enable_dataloader: false
 fields:
   name:
     type: text

package/main/default/objects/objects.object.yml CHANGED Viewed

@@ -3,6 +3,7 @@ icon: orders
 label: Object
 version: 2
 hidden: true
+enable_dataloader: false
 fields:
   datasource:
     type: master_detail
@@ -133,6 +134,13 @@ fields:
     inlineHelpText: When enabled, the lookup field associated with this object displays its options as a pop-up window.
     group: Switch
     defaultValue: false
+  enable_dataloader:
+    type: boolean
+    label: Enable Dataloader
+    inlineHelpText: Enable the dataloader for the object GraphQL API. The default value is "true".
+    group: Switch
+    defaultValue: true
+    hidden: true
   # enable_audit:
   #   type: boolean
   #   label: Enable Audit

package/main/default/pages/object_fields.page.amis.json ADDED Viewed

@@ -0,0 +1,42 @@
+{
+    "type": "page",
+    "body": [
+      {
+        "type": "steedos-object-form",
+        "label": "对象表单",
+        "objectApiName": "object_fields",
+        "recordId": "${recordId}",
+        "className": "sm:border sm:shadow sm:rounded sm:border-gray-300 bg-white p-4",
+        "id": "u:b3d626885b90",
+        "mode": "edit",
+        "layout": "normal",
+        "enableTabs": true,
+        "onEvent": {
+          "change": {
+            "actions": [
+              {
+                "actionType": "setValue",
+                "args": {
+                  "value": {
+                    "defaultValue": ""
+                  }
+                },
+                "expression": "${!!event.data.defaultValue_formula}"
+              }
+            ]
+          }
+        },
+        "initApiAdaptor": "const defaultValue_field_value = payload.data.defaultValue; if(defaultValue_field_value && _.isString(defaultValue_field_value) && defaultValue_field_value.indexOf('{')>-1 ){ payload.data.defaultValue_formula = defaultValue_field_value; delete payload.data.defaultValue; } return payload;",
+        "apiRequestAdaptor": "if(formData.defaultValue_formula){ formData.defaultValue = formData.defaultValue_formula }  __saveData = JSON.stringify(JSON.stringify(formData)); api.data = {query: query.replace('{__saveData}', __saveData)};"
+      }
+    ],
+    "regions": [
+      "body"
+    ],
+    "data": {
+      "objectName": "object_fields"
+    },
+    "name": "page_object_fields_form",
+    "bodyClassName": "",
+    "id": "u:6e9674f278b0"
+}

package/main/default/pages/object_fields.page.yml ADDED Viewed

@@ -0,0 +1,12 @@
+name: object_fields
+is_active: true
+label: 对象字段表单
+object_name: object_fields
+pageAssignments:
+  - desktop: true
+    mobile: true
+    page: object_fields_form
+    type: orgDefault
+render_engine: amis
+type: form
+widgets: []

package/main/default/routes/amis_button_design.router.js CHANGED Viewed

@@ -24,9 +24,16 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
         const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/object_actions/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

package/main/default/routes/amis_listview_design.router.js CHANGED Viewed

@@ -24,10 +24,15 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
         const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/object_listviews/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
         const record = await objectql.getObject('object_listviews').findOne(req.query.id);
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

package/main/default/services/object_fields.service.js ADDED Viewed

@@ -0,0 +1,242 @@
+/*
+ * @Description: 提供action_field_updates(字段更新对象)需要的数据接口
+ */
+const register = require("@steedos/metadata-registrar");
+const steedosI18n = require("@steedos/i18n");
+const _ = require("lodash");
+const clone = require("clone");
+module.exports = {
+    name: "object_fields",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+    },
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+    /**
+     * Actions
+     */
+    actions: {
+        getDefaultValueSchema: {
+            // 需要传 objectName, targetObject(非必填), field_name 参数进来。
+            rest: {
+                method: "GET",
+                path: "/defaultValue/schema"
+            },
+            async handler(ctx) {
+                const data = await this.getDefaultValueSchema(ctx);
+                return { status: 0, msg: "", data: data }
+            }
+        }
+    },
+    /**
+     * Events
+     */
+    events: {
+    },
+    /**
+     * Methods
+     */
+    methods: {
+        /* defaultValue 字段使用*/
+        getDefaultValueSchema: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const type = ctx.params.type || 'text';
+                const objectName = ctx.params.object;
+                const fieldName = ctx.params.name;
+                const reference_to = ctx.params.reference_to;
+                const options = ctx.params.options;
+                const multiple = ctx.params.multiple;
+                const filtersFunction = ctx.params.filtersFunction;
+                const reference_to_field = ctx.params.reference_to_field || '_id';
+                const _id = ctx.params._id;
+                const mode = ctx.params.mode;
+                // const mode = global.mode;
+                const partialType = ['text','textarea','html','code','markdown','boolean','toggle','date','datetime','time','number','currency','percent','password','url','email'];
+                // const fieldType = partialType.indexOf(type) > -1 ? type : 'text';
+                let targetField = null;
+                let NAME_FIELD_KEY = null;
+                if (mode === 'read') {
+                    const objectConfig = await register.getObjectConfig(objectName);
+                    NAME_FIELD_KEY = objectConfig.NAME_FIELD_KEY || 'name';
+                    targetField = objectConfig.fields[fieldName];
+                }
+                const value = (targetField && targetField.defaultValue) || '';
+                const translatedLabel = lng === 'zh-CN' ? "默认值" : 'DefaultValue';
+                let defaultValue_schema = {
+                    "type": "text",
+                    "name": "defaultValue",
+                    "label": translatedLabel,
+                    "labelClassName": "text-left"
+                }
+                if(partialType.indexOf(type) > -1){
+                    defaultValue_schema.type = type;
+                }else if(type === 'select' && options){
+                    defaultValue_schema.type = type;
+                    defaultValue_schema.options = options;
+                    defaultValue_schema.multiple = multiple;
+                }else if(['lookup','master_detail'].includes(type) && reference_to){
+                    defaultValue_schema.type = type;
+                    defaultValue_schema.reference_to = reference_to;
+                    defaultValue_schema.multiple = multiple;
+                    defaultValue_schema.filtersFunction = filtersFunction;
+                    defaultValue_schema.reference_to_field = reference_to_field;
+                }
+                let steedos_field = {
+                    type:'steedos-field',
+                    name:'defaultValue',
+                    clearValueOnHidden: true,
+                    fieldName: 'defaultValue',
+                    field: defaultValue_schema,
+                    value: value,
+                    readonly: mode === 'read' ?  true : false
+                };
+                if(mode === 'read'){
+                    const baseFieldConfig = {
+                        "name": "defaultValue",
+                        "label": translatedLabel,
+                        "labelClassName": "text-left",
+                        "clearValueOnHidden": true,
+                        "fieldName": "defaultValue"
+                    }
+                    if(_.isString(value) && value.indexOf('{')>-1){
+                        // 只读时值是公式就显示公式
+                        steedos_field = {
+                            "type": "control",
+                            "label": translatedLabel,
+                            "body": {
+                                "name": "defaultValue",
+                                "label": translatedLabel,
+                                "labelClassName": "text-left",
+                                "type": "tpl",
+                                "tpl": value.indexOf('$') > -1 ? "\\"+value : value
+                            }
+                        }
+                    }else if(['number','currency','percent'].includes(type)){
+                        steedos_field = {
+                            ...baseFieldConfig,
+                            "type": "static-tpl",
+                            "tpl": `<div>${value}</div>`,
+                            "className": "m-1 md:border-b steedos-static-tpl-readonly",
+                            "quickEdit": false,
+                        }
+                    }else if(['date','datetime','time'].includes(type)){
+                        let fieldTypeConfig ={};
+                        if(type==='date'){
+                            fieldTypeConfig = {
+                                "type": "input-date",
+                                "inputFormat": "YYYY-MM-DD",
+                                "format": "YYYY-MM-DDT00:00:00.000[Z]",
+                                "className": "m-1 steedos-input-date-edit",
+                            }
+                        }else if(type==='datetime'){
+                            fieldTypeConfig = {
+                                "type": "input-datetime",
+                                "inputFormat": "YYYY-MM-DD HH:mm",
+                                "format": "YYYY-MM-DDTHH:mm:ss.SSSZ",
+                                "className": "m-1 steedos-input-datetime-edit",
+                            }
+                        }else if(type==='time'){
+                            fieldTypeConfig = {
+                                "type": "input-time",
+                                "inputFormat": "HH:mm",
+                                "format": "1970-01-01THH:mm:00.000[Z]",
+                                "className": "m-1 steedos-input-time-edit",
+                            }
+                        }
+                        steedos_field = {
+                            ...baseFieldConfig,
+                            ...fieldTypeConfig,
+                            value: value,
+                            static: true
+                        }
+                    }else if(['boolean'].includes(type)){
+                        steedos_field = {
+                            ...baseFieldConfig,
+                            value: value,
+                            "type": "static",
+                            "tpl": `${value}`,
+                            "className": "m-1 md:border-b steedos-static-readonly"
+                        }
+                    }else if(['lookup','master_detail'].includes(type)){
+                        // console.log('t==>', type, reference_to, NAME_FIELD_KEY, targetField)
+                        if(value && value.length && _.isString(reference_to)){
+                            const query = {
+                                fields: [NAME_FIELD_KEY],
+                                filters: [reference_to_field, '=', value]
+                            }
+                            const res = await this.broker.call(
+                                'objectql.find',
+                                {
+                                  objectName: reference_to,
+                                  query
+                                }
+                            );
+                            // console.log('res==>', res, reference_to, NAME_FIELD_KEY, targetField);
+                            const tpl = _.map(res, NAME_FIELD_KEY).join('、')
+                            steedos_field = {
+                                "type": "control",
+                                "label": translatedLabel,
+                                "body": {
+                                    "name": "defaultValue",
+                                    "label": translatedLabel,
+                                    "labelClassName": "text-left",
+                                    "type": "tpl",
+                                    "tpl": tpl
+                                },
+                                value: value
+                            }
+                        }
+                    }
+                }
+                let body = [
+                    steedos_field
+                ]
+                if(mode === 'edit'){
+                    body[0].field.amis = {
+                        // disabledOn: "!!this.defaultValue_formula",
+                        "className": {
+                            "defaultValue_field_hidden": "!this.defaultValue && (!this.defaultValue || '').toString() && !!this.defaultValue_formula"
+                        }
+                    }
+                    body.push({
+                        "name": "defaultValue_formula",
+                        "label": translatedLabel,
+                        "evalMode": false,
+                        "type": "input-formula",
+                        "placeholder": "公式",
+                        // "disabledOn": "!!this.defaultValue && !!this.defaultValue.toString()",
+                        "className": {
+                            "defaultValue_field_formula": true,
+                            "defaultValue_field_formula_visible": "!!this.defaultValue_formula",
+                            "defaultValue_field_formula_hidden": "(!!this.defaultValue && !!this.defaultValue.toString()) || (!this.defaultValue && !this.defaultValue_formula)"
+                        }
+                    })
+                }
+                // console.log('body==>', body);
+                return {
+                    body
+                }
+            }
+        }
+    }
+};

package/main/default/triggers/object_listviews.trigger.js CHANGED Viewed

@@ -52,8 +52,8 @@ module.exports = {
         let views = []
         if(filters._id && !filters._id.$ne){
             let id = filters._id
-            id = id.replace(/\\/g, '');
             if(_.isString(id)){
+                id = id.replace(/\\/g, ''); // string类型才有replce方法
                 let objectName = id.substr(0, id.indexOf("."));
                 if(objectName){
                     let view = await InternalData.getObjectListView(objectName, this.userId, id);
@@ -62,6 +62,21 @@ module.exports = {
                     }
                 }
             }
+            else if (id.$in) {
+                for (const _id of id.$in) {
+                    if(_.isString(_id) && _id.indexOf('.') > 0){
+                        let objectName = _id.split('.')[0];
+                        let view = await InternalData.getObjectListView(objectName, this.userId, _id);
+                        if(view){
+                            if (_.isArray(this.query.fields)) {
+                                const fields = ["_id"].concat(this.query.fields);
+                                view = _.pick(view, fields);
+                            }
+                            views.push(view);
+                        }
+                    }
+                }
+            }
         }else if(filters.object_name){
             views = await InternalData.getObjectListViews(filters.object_name, this.userId);
         }

package/main/default/triggers/objects.trigger.js CHANGED Viewed

@@ -76,10 +76,35 @@ module.exports = {
         }
     },
     afterInsert: async function(){
-        const doc = this.doc;
-        if(doc.enable_tree){
-            await objectTree.insertParentAndChildrenFieldForTreeObject(doc)
+        const object = this.doc;
+        const { spaceId , userId } = this;
+        if(object.enable_tree){
+            await objectTree.insertParentAndChildrenFieldForTreeObject(object)
         }
+        const tabLabel = object.label || object.name;
+        const tabName = "object_" + object.name.replace(/__c$/, "");
+        const now = new Date();
+        const tabDoc = {
+            label: tabLabel,
+            name: tabName,
+            icon: object.icon,
+            type: "object",
+            mobile: true,
+            desktop: true,
+            object: object.name,
+            space: spaceId,
+            owner: userId,
+            created_by: userId,
+            created: now,
+            modified_by: userId,
+            modified: now,
+            company_id: object.companyId,
+            company_ids: object.companyIds
+        };
+        await objectql.getObject('tabs').insert(tabDoc);
         // let spaceProfiles = await objectql.getObject('permission_set').find({space: this.spaceId, type: 'profile'});
         // await objectql.getObject('object_layouts').insert({
         //     label: 'default',
@@ -145,5 +170,13 @@ module.exports = {
         */
         await sleep(1000 * 2)
+    },
+    afterDelete: async function(){
+        const { previousDoc: object, spaceId } = this;
+        const objectTabs = await objectql.getObject('tabs').find({filters: [['type', '=', 'object'], ['object', '=', object.name], ['space', '=', spaceId]]})
+        for(const record of objectTabs){
+            // console.log(`delete tabs`, record._id, record.name)
+            await objectql.getObject('tabs').delete(record._id);
+        }
     }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.1-beta.5",
+    "version": "2.6.1-beta.7",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "28d9ffe3cc73f4a89abea60c659f3b89eaaf378b"
+    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
 }