@steedos/standard-object-database 2.7.0-beta.3 → 2.7.0-beta.31

package/main/default/triggers/object_fields.trigger.js

@@ -2,7 +2,7 @@ const InternalData = require('@steedos/standard-objects').internalData;
 var _ = require("underscore");
 const odataMongodb = require("@steedos/odata-v4-mongodb");
 const clone = require('clone');
-var objectCore = require('../objects/objects.core.js');
+var objectCore = require('../server/objects.core.js');
 const objectql = require('@steedos/objectql');
 const register = require('@steedos/metadata-registrar');
 const auth = require('@steedos/auth');
@@ -217,6 +217,12 @@ const initSummaryDoc = async (doc) => {
 
 module.exports = {
     afterFind: async function(){
+
+
+        _.each(this.data.values, (item)=>{
+            item.is_customize = true
+        })
+
         let filters = InternalData.parserFilters(this.query.filters);
         let objectName = filters.object;
         if(!objectName && filters._id && filters._id.indexOf(".") > -1){
@@ -243,7 +249,12 @@ module.exports = {
             if(obj){
                 this.data.values = _.map(this.data.values, (item)=>{
                     if(item.is_system){
-                        return Object.assign(item, _.find(obj.fields, (field)=>{return field.name === item.name}))
+                        const mField = _.find(obj.fields, (field)=>{return field.name === item.name})
+                        if(mField){
+                            return Object.assign(item, mField, mField?.override || {})
+                        }else{
+                            return item;
+                        }
                     }else{
                         return item;
                     }
@@ -262,6 +273,15 @@ module.exports = {
         if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'type')){
             query.fields.push('type')
         }
+
+
+        let filters = InternalData.parserFilters(this.query.filters);
+        if(filters._id && _.isString(filters._id) && filters._id.indexOf(".") > -1){
+            const [objectName, fieldName] = filters._id.split('.');
+            query.filters = [['object', '=', objectName], ['name', '=', fieldName]]
+        }
+
+       
     },
     beforeAggregate: async function(){
         const { query } = this;
@@ -300,10 +320,13 @@ module.exports = {
                     this.data.values = field;
                 }
             }
+        }else{
+            this.data.values.is_customize = true
         }
     },
     beforeInsert: async function () {
         let doc = this.doc;
+        delete doc.is_customize
         validateDoc(doc);
         await checkFormulaInfiniteLoop(doc);
         await checkMasterDetailTypeField(doc);
@@ -328,6 +351,7 @@ module.exports = {
     },
     beforeUpdate: async function () {
         let { doc, object_name, id} = this;
+        delete doc.is_customize
         validateDoc(doc);
         // const dbDoc = await objectql.getObject(object_name).findOne(id)
         const dbDoc = objectql.wrapAsync(async function(){

package/main/default/triggers/object_validation_rules.trigger.js

@@ -18,7 +18,7 @@ module.exports = {
     },
     afterFind: async function(){
         const { spaceId } = this;
-        let dataList = register.getAllObjectValidationRules();
+        let dataList = await register.getAllObjectValidationRules();
         if (!_.isEmpty(dataList)) {
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
@@ -36,25 +36,6 @@ module.exports = {
         }
 
     },
-    afterAggregate: async function(){
-        const { spaceId } = this;
-        let dataList = register.getAllObjectValidationRules();
-        if (!_.isEmpty(dataList)) {
-            dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    this.data.values.push(doc);
-                }
-            })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-            if (records.length > 0) {
-                this.data.values = records;
-            } else {
-                this.data.values.length = 0;
-            }
-        }
-    },
     afterCount: async function(){
         delete this.query.fields;
         let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
@@ -62,7 +43,7 @@ module.exports = {
     },
     afterFindOne: async function(){
         if (_.isEmpty(this.data.values)) {
-            const all = register.getAllObjectValidationRules();
+            const all = await register.getAllObjectValidationRules();
             const id = this.id;
             this.data.values = _.find(all, function (item) {
                 return item._id === id

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

@@ -1,7 +1,7 @@
 const InternalData = require('@steedos/standard-objects').internalData;
 const _ = require('underscore');
 const objectql = require('@steedos/objectql');
-const objectTree = require('../objects/objects.tree.js');
+const objectTree = require('../server/objects.tree.js');
 
 const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -17,15 +17,15 @@ module.exports = {
     afterFind: async function(){
         let userId = this.userId
         let spaceId = this.spaceId;
-        for (const doc of this.data.values) {
-            doc.fields =  Object.assign({}, doc.fields, await InternalData.getDefaultSysFields(doc.name, userId)) ;
-        }
-        // this.data.values = this.data.values.concat(await InternalData.findObjects(userId, this.query.filters));
+
+        _.each(this.data.values, (item)=>{
+            item.is_customize = true
+        })
 
         this.data.values = this.data.values.concat(await InternalData.getObjects(userId));
 
         this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-        
+
         _.each(this.data.values, function(value){
             if(value){
                 delete value.actions;
@@ -44,6 +44,8 @@ module.exports = {
     afterFindOne: async function(){
         if(_.isEmpty(this.data.values)){
             this.data.values = await InternalData.getObject(this.id, this.userId);
+        }else{
+            this.data.values.is_customize = true
         }
         if(this.data.values){
             delete this.data.values.actions;
@@ -104,8 +106,13 @@ module.exports = {
         // })
         await sleep(1000 * 2)
     },
+    beforeInsert: async function () {
+        let doc = this.doc;
+        delete doc.is_customize
+    },
     beforeUpdate: async function () {
         const { doc, id, object_name } = this;
+        delete doc.is_customize
         // 如果用户修改了apiname，则校验 数据源必须一致为default数据源；且数据库中不能有新的apiname对应的表
         if (_.has(doc, 'name')) {
             const obj = this.getObject(object_name);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.0-beta.3",
+    "version": "2.7.0-beta.31",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,10 +12,10 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.0-beta.3",
-        "@steedos/standard-objects": "2.7.0-beta.3"
+        "@steedos/metadata-core": "2.7.0-beta.31",
+        "@steedos/standard-objects": "2.7.0-beta.31"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "753d7fa0840e6e254423eafbdd132ec10ca4072e"
+    "gitHead": "3c128fb9db10e54320e35a6ef2fd4e805b4a20d5"
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-29 10:24:41
+ * @LastEditTime: 2024-03-20 14:30:13
  * @Description: 
  */
 "use strict";
@@ -115,8 +115,7 @@ module.exports = {
 					}
 				}
 				if(data.is_system){
-					// 'label' 先禁止编辑label , 目前由于i18n的问题导致 label无效.
-					data = _.pick(data, ['defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior', 'enable_thousands', 'autonumber_enable_modify']);
+					data = _.pick(data, ['label', 'defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior', 'enable_thousands', 'autonumber_enable_modify', 'auto_fill_mapping']);
 				}
                 return object.update(id, data, userSession)
 			},

package/main/default/objects/_object_reload_logs.object.yml

@@ -1,10 +0,0 @@
-name: _object_reload_logs
-hidden: true
-fields:
-  object_name:
-    type: text
-  change_date:
-    type: object
-    blackbox: true
-  change_time:
-    type: datetime

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

@@ -1,124 +0,0 @@
-name: datasources
-label: DataSource
-icon: entity
-hidden: true
-version: 2
-enable_dataloader: false
-fields:
-  driver:
-    type: select
-    label: Driver
-    options: MongoDB:mongo,SQL Server:sqlserver,PostgreSQL:postgres,Oracle:oracle,MySQL:mysql,Sqlite:sqlite
-    required: true
-    sort_no: 30
-  label:
-    type: text
-    label: Label
-    required: true
-    is_name: true
-    sort_no: 10
-  name:
-    type: text
-    label: Name
-    searchable: true
-    index: true
-    required: true
-    inlineHelpText: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters
-    sort_no: 20
-  # url:
-  #   type: text
-  #   label: Url
-  host:
-    type: text
-    label: Database host
-    group: Other connection options
-  port:
-    type: number
-    scale: 0
-    label: Database host port
-    group: Other connection options
-  database:
-    type: text
-    label: Database name
-    group: Other connection options
-  username:
-    type: text
-    label: Database username
-    group: Other connection options
-  password:
-    type: password
-    label: Database password
-    group: Other connection options
-  mssql_options:
-    type: textarea
-    label: Mssql connection options 
-    is_wide: true
-    group: Mssql
-  connectString:
-    type: textarea
-    label: connectString
-    is_wide: true
-    group: Oracle
-  timezone:
-    type: text
-    label: Timezone
-    group: advanced
-  options:
-    type: object
-    label: Options
-    hidden: true
-  enable_space:
-    type: boolean
-    omit: true
-    hidden: true
-    label: Enable Space
-  locale:
-    type: text
-    label: Locale
-    group: advanced
-  logging:
-    type: boolean
-    label: Debug
-    group: advanced
-  is_enable:
-    type: boolean
-    label: Enable
-  record_permissions: 
-    type: object
-    visible_on: "{{global.mode ==='read' ? true : false}}"
-  is_system:
-    type: boolean
-    label: System
-    readonly: true
-    visible_on: "{{global.mode ==='read' ? true : false}}"
-    disabled: true
-list_views:
-  all:
-    columns:
-      - label
-      - name
-      - is_enable
-      - driver
-      - is_system
-    label: All
-    filter_scope: space
-actions:
-  testConnection:
-    label: Test connection
-    on: record
-    visible: true
-permission_set:
-  user:
-    allowCreate: false
-    allowDelete: false
-    allowEdit: false
-    allowRead: false
-    modifyAllRecords: false
-    viewAllRecords: false
-  admin:
-    allowCreate: true
-    allowDelete: true
-    allowEdit: true
-    allowRead: true
-    modifyAllRecords: true
-    viewAllRecords: true

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

@@ -1,60 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-09-21 18:19:06
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-16 13:58:08
- * @Description: 
- */
-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}&locale=${Builder.settings.locale}`);
-  },
-  showDesignVisible: function (object_name, record_id, record_permissions, data) {
-      var perms;
-      var record = (data && data.record) || Creator.getObjectRecord(object_name, record_id);
-      if(record.type === 'amis_button'){
-        perms = {};
-        if (record_permissions) {
-            perms = record_permissions;
-        } else {
-            record_permissions = Creator.getRecordPermissions(object_name, record, Meteor.userId());
-            if (record_permissions) {
-                perms = record_permissions;
-            }
-        }
-        return perms["allowEdit"];
-      }
-      return false;
-  },
-  customize: function (object_name, record_id, fields) {
-    var doc = Creator.odata.get(object_name, record_id);
-    var newDoc = {}
-    _.each(Creator.getObject(object_name).fields, function(v, k){
-        if(_.has(doc, k)){
-            newDoc[k] = doc[k]
-        }
-    })
-    delete newDoc.is_system;
-
-    let docName = doc.name
-    let docObjectName = doc.object
-    
-    Creator.odata.insert(object_name, Object.assign(newDoc, {name: docName, object: docObjectName}), function(result, error){
-        if(result){
-            if(Session.get("object_name") === 'object_actions'){
-                FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
-            }else{
-                href = Creator.getObjectUrl(object_name, result._id);
-                window.open(href,'_blank','width=800, height=600, left=50, top= 50, toolbar=no, status=no, menubar=no, resizable=yes, scrollbars=yes')
-            }
-        }
-    });
-  },
-  customizeVisible: function(object_name, record_id, record_permissions, data){
-      var record = data && data.record;
-      if(!record){
-          record = {}
-      }
-      return Creator.baseObject.actions.standard_new.visible() && record.is_system && record.type == 'amis_button';
-  }
-}

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

@@ -1,193 +0,0 @@
-name: object_actions
-label: Object Action
-icon: actions_and_buttons
-enable_dataloader: false
-hidden: true
-version: 2
-fields:
-  object:
-    type: master_detail
-    reference_to: objects
-    reference_to_field: name
-    write_requires_master_read: true
-    required: true
-    label: Object
-    create: false
-    sort_no: 110
-  label:
-    type: text
-    label: Label
-    required: true
-    is_name: true
-    sort_no: 120
-  name:
-    type: text
-    sort_no: 130
-    label: API Name
-    searchable: true
-    index: true
-    required: true
-    inlineHelpText: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters
-  is_enable:
-    type: boolean
-    label: Enable
-    sort_no: 140
-    defaultValue: true
-  visible:
-    type: boolean
-    # omit: true
-    # hidden: true
-    label: Visible
-    sort_no: 150
-  'on':
-    type: lookup
-    label: 'On'
-    is_wide: true
-    required: true
-    showIcon: false
-    sort_no: 160
-    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
-    visible_on: "${false}"
-    options:
-      - label: Custom JavaScript
-        value: script
-      - label: Amis Button
-        value: amis_button
-      # - label: 打印模板(word)
-      #   value: word-print
-    defaultValue: amis_button
-  # word_template:
-  #   type: lookup
-  #   reference_to: word_templates
-  #   visible_on: "{{formData.type === 'word-print' ? true: false}}"
-  #   create: false
-  # todo:
-  #   label: Execute Script
-  #   sort_no: 180
-  #   type: code
-  #   language: javascript
-  #   required: "{{formData.type != 'amis_button' ? true: false}}"
-  #   # omit: true
-  #   # hidden: true
-  #   is_wide: true
-  #   visible_on: "{{formData.type != 'amis_button' ? true: false}}"
-  amis_schema: 
-    label: Amis Schema
-    sort_no: 180
-    type: code
-    language: json
-    required: false
-    is_wide: true
-    # hidden: true
-    visible_on: "{{false}}"
-  is_system:
-    type: boolean
-    label: 系统
-    # omit: true
-    readonly: true
-    visible_on: "{{global.mode ==='read' ? true : false}}"
-    disabled: true
-    sort_no: 500
-form:
-  initialValues: !!js/function |
-    function(){
-      return {type: 'amis_button'}
-    }
-paging:
-  enabled: false
-actions: 
-  showDesign: 
-    label: 设计器
-    on: record_only
-  customize:
-    label: 自定义
-    on: record_only
-list_views:
-  all:
-    columns:
-      - label
-      - name
-      - object
-      - 'on'
-      - is_enable
-      - modified
-      - is_system
-    label: All
-    filter_scope: space
-  customize:
-    columns:
-      - label
-      - name
-      - object
-      - 'on'
-      - is_enable
-      - modified
-      - is_system
-    label: 自定义
-    filters:
-      - ["is_system","<>",true]
-    filter_scope: space
-permission_set:
-  user:
-    allowCreate: false
-    allowDelete: false
-    allowEdit: false
-    allowRead: false
-    modifyAllRecords: false
-    viewAllRecords: false
-  admin:
-    allowCreate: true
-    allowDelete: true
-    allowEdit: true
-    allowRead: true
-    modifyAllRecords: true
-    viewAllRecords: true