@steedos/standard-object-database 2.7.0-beta.24 → 2.7.0-beta.26

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

@@ -4,5 +4,5 @@ hidden: false
 label: 已删除
 omit: true
 readonly: false
-sort_no: 80
-visible_on: '{{global.mode ===''read'' ? true : false}}'
+sort_no: 280
+visible_on: '{{false}}'

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

@@ -2,7 +2,10 @@ name: is_enable
 amis:
   disabledOn: '${is_system == true}'
 defaultValue: true
-hidden: false
+filters: []
+hidden: true
 label: Enable
-sort_no: 40
+required: false
+sort_no: 250
 type: boolean
+visible_on: '{{false}}'

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

@@ -3,6 +3,6 @@ disabled: true
 hidden: false
 label: System
 readonly: true
-sort_no: 70
+sort_no: 110
 type: boolean
 visible_on: '{{global.mode ===''read'' ? true : false}}'

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

@@ -3,5 +3,6 @@ blackbox: true
 hidden: true
 label: ListViews
 omit: true
-sort_no: 370
+sort_no: 350
 type: object
+visible_on: '{{false}}'

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

@@ -3,5 +3,6 @@ hidden: true
 index: true
 label: Owner
 omit: true
-sort_no: 430
+sort_no: 410
 sortable: true
+visible_on: '{{false}}'

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

@@ -3,5 +3,6 @@ blackbox: true
 hidden: true
 label: Permission Set
 omit: true
-sort_no: 400
+sort_no: 380
 type: object
+visible_on: '{{false}}'

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

@@ -3,5 +3,6 @@ blackbox: true
 hidden: true
 label: Related List
 omit: true
-sort_no: 390
+sort_no: 370
 type: grid
+visible_on: '{{false}}'

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

@@ -4,5 +4,6 @@ hidden: true
 label: 重新加载时间
 omit: true
 readonly: true
-sort_no: 490
+sort_no: 450
 type: datetime
+visible_on: '{{false}}'

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

@@ -3,5 +3,6 @@ blackbox: true
 hidden: true
 label: Sidebar
 omit: true
-sort_no: 350
+sort_no: 330
 type: object
+visible_on: '{{false}}'

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

@@ -1,10 +1,11 @@
 name: table_name
 amis:
   disabledOn: '${is_system == true}'
-group: External data source
+group: advanced
+hidden: false
 index: true
 inlineHelpText: The default data source does not support this property
 label: Table Name
 searchable: true
-sort_no: 320
+sort_no: 190
 type: text

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

@@ -3,5 +3,6 @@ blackbox: true
 hidden: true
 label: Triggers
 omit: true
-sort_no: 410
+sort_no: 390
 type: object
+visible_on: '{{false}}'

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

@@ -4,5 +4,6 @@ hidden: true
 label: Version
 readonly: true
 scale: 0
-sort_no: 330
+sort_no: 320
 type: number
+visible_on: '{{false}}'

package/main/default/objects/objects/listviews/all.listview.yml

@@ -3,7 +3,6 @@ columns:
   - label
   - name
   - in_development
-  - is_enable
   - is_system
   - is_customize
 extra_columns:

package/main/default/objects/objects/listviews/customize.listview.yml

@@ -3,7 +3,6 @@ columns:
   - label
   - name
   - in_development
-  - is_enable
   - is_system
   - is_customize
 extra_columns:

package/main/default/objects/objects/listviews/deleted.listview.yml

@@ -3,7 +3,6 @@ columns:
   - label
   - name
   - in_development
-  - is_enable
   - is_system
 extra_columns:
   - datasource

package/main/default/objects/objects/listviews/system.listview.yml

@@ -3,7 +3,6 @@ columns:
   - label
   - name
   - in_development
-  - is_enable
   - is_system
   - is_customize
 extra_columns:

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

@@ -1,44 +1,12 @@
 name: objects
 custom: true
 enable_dataloader: false
-hidden: false
+field_groups:
+  - group_name: switch
+  - group_name: advanced
+hidden: true
 icon: orders
-label: Object
+label: Objects
 paging:
   enabled: false
-relatedList:
-  - objectName: object_fields
-    columns:
-      - label
-      - name
-      - type
-      - object
-      - group
-      - sort_no
-  - objectName: object_listviews
-    columns:
-      - label
-      - name
-      - shared
-      - owner
-  - objectName: object_actions
-    columns:
-      - label
-      - name
-      - object
-      - 'on'
-      - is_enable
-  - objectName: object_layouts
-    columns:
-      - label
-      - name
-      - object_name
-      - profiles
-  - permission_objects
-  - object_workflows
-  - process_definition
-  - object_validation_rules
-  - restriction_rules
-  - share_rules
-  - process
 version: 2

package/main/default/pages/object_form.page.amis.json

@@ -21,12 +21,7 @@
                       "position": "top-right"
                     }
                 }
-            ],
-            "fieldsExtend": {
-                "compactLayouts": {
-                    "label": ""
-                }
-            }
+            ]
         }
     ],
     "data": {

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

@@ -275,12 +275,13 @@ function onChangeName(oldName, newDoc){
   })
 }
 
-//只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符 TODO 支持表格
+//[Task]: 字段名允许输入大写字母 #6702
+//只能包含字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符 TODO 支持表格
 function checkName(name){
-  var reg = new RegExp('^[a-z]([a-z0-9]|_(?!_))*[a-z0-9]$'); //支持表格类型的验证表达式(待优化.$.限制只能出现一次): new RegExp('^[a-z]([a-z0-9]|_(?!_))*(\\.\\$\\.\\w+)*[a-z0-9]$')
+  var reg = new RegExp('^[a-zA-Z]([A-Za-z0-9]|_(?!_))*[A-Za-z0-9]$'); //支持表格类型的验证表达式(待优化.$.限制只能出现一次): new RegExp('^[a-z]([a-z0-9]|_(?!_))*(\\.\\$\\.\\w+)*[a-z0-9]$')
   //TODO 撤销注释
   if(!reg.test(name)){
-    throw new Error("'字段名'只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
+    throw new Error("字段名只能包含字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
   }
   if(name.length > 50){
     throw new Error("名称长度不能大于50个字符");

package/main/default/server/objects.core.js

@@ -379,13 +379,13 @@ function reloadObject(changeLog){
 
 }
 
-function triggerReloadObject(objectName, type, value, event){
+function triggerReloadObject(objectName, type, value, event)
+{
+    // console.log(`triggerReloadObject===>`, objectName, type, event)
     const objectRecord = Creator.getCollection("objects").findOne({
         name: objectName
       })
-    if(objectRecord && objectRecord.is_system != true){
-        //TODO 待支持动态加载related_list后， 删除此行代码
-        // console.log(`triggerReloadObject===>`, objectName)
+    if(objectRecord && objectRecord.is_system != true && objectName != "objects" && objectName != "object_fields"){
         Creator.getCollection("objects").update({name: objectName}, {$set: {reload_time: new Date()}})
     }else{
         Creator.getCollection("_object_reload_logs").insert({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.0-beta.24",
+    "version": "2.7.0-beta.26",
     "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.24",
-        "@steedos/standard-objects": "2.7.0-beta.24"
+        "@steedos/metadata-core": "2.7.0-beta.26",
+        "@steedos/standard-objects": "2.7.0-beta.26"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "58c8b3bf860e12f6cdcd85ce90e2e4df2337755a"
+    "gitHead": "703c8183a1cf1d28a22d48c07a462f1087ac1dec"
 }

package/main/default/objects/objects/buttons/createDefaultRecordView.button.js

@@ -1,3 +0,0 @@
-module.exports = { 
-
- }

package/main/default/objects/objects/buttons/createDefaultRecordView.button.yml

@@ -1,5 +0,0 @@
-name: createDefaultRecordView
-is_enable: true
-label: 创建默认页面布局
-'on': record_only_more
-visible: false

package/main/default/server/datasources.action.js

@@ -1,51 +0,0 @@
-module.exports = {
-    testConnection: function(object_name, record_id, fields){
-        window.$("body").addClass("loading");
-        var userSession = Creator.USER_CONTEXT;
-        var spaceId = userSession.spaceId;
-        var authToken = userSession.authToken ? userSession.authToken : userSession.user.authToken;
-        var url = "/api/v4/datasources/" + record_id + "/testConnection";
-        url = Steedos.absoluteUrl(url);
-        try {
-            var authorization = "Bearer " + spaceId + "," + authToken;
-            var headers = [{
-                name: 'Content-Type',
-                value: 'application/json'
-            }, {
-                name: 'Authorization',
-                value: authorization
-            }];
-            window.$.ajax({
-                type: "get",
-                url: url,
-                dataType: "json",
-                contentType: 'application/json',
-                beforeSend: function (XHR) {
-                    if (headers && headers.length) {
-                        return headers.forEach(function (header) {
-                            return XHR.setRequestHeader(header.name, header.value);
-                        });
-                    }
-                },
-                success: function (data) {
-                    window.$("body").removeClass("loading");
-                    toastr.success(t('_datasources_testConnection_ok'));
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    console.error(XMLHttpRequest.responseJSON);
-                    window.$("body").removeClass("loading");
-                    if (XMLHttpRequest.responseJSON && XMLHttpRequest.responseJSON.error) {
-                        toastr.error(t(XMLHttpRequest.responseJSON.error.replace(/:/g, '：')))
-                    }
-                    else {
-                        toastr.error(XMLHttpRequest.responseJSON)
-                    }
-                }
-            });
-        } catch (err) {
-            console.error(err);
-            toastr.error(err);
-            window.$("body").removeClass("loading");
-        }
-    }
-  }

package/main/default/server/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/server/object_fields.action.js

@@ -1,128 +0,0 @@
-module.exports = {
-  recomputeFormulaValues: function (object_name, record_id, item_element) {
-    $("body").addClass("loading");
-    var userSession = Creator.USER_CONTEXT;
-    var authorization = "Bearer " + userSession.spaceId + "," + userSession.user.authToken;
-    $.ajax({
-      type: "POST",
-      url: Steedos.absoluteUrl("/api/v4/" + object_name + "/" + record_id + "/recomputeFormulaValues"),
-      data: JSON.stringify({}),
-      dataType: "json",
-      contentType: 'application/json',
-      beforeSend: function (XHR) {
-        XHR.setRequestHeader('Content-Type', 'application/json');
-        XHR.setRequestHeader('Authorization', authorization);
-      },
-      success: function (data) {
-        $("body").removeClass("loading");
-        if(data){
-          if(data.error){
-            toastr.error(t("object_fields_function_recomputeFormulaValues_error", t(data.error.reason)));
-          }
-          else{
-            toastr.success(t("object_fields_function_recomputeFormulaValues_success"));
-          }
-        }
-      },
-      error: function (XMLHttpRequest, textStatus, errorThrown) {
-        $("body").removeClass("loading");
-        var errorMsg = errorThrown;
-        var error = XMLHttpRequest.responseJSON.error;
-        if(error){
-          console.error("Recompute Formula Values Faild:", error);
-          if(error.reason){
-            errorMsg = error.reason;
-          }
-          else if(error.message){
-            errorMsg = error.message;
-          }
-          else{
-            errorMsg = error;
-          }
-        }
-        errorMsg = t(errorMsg);
-        if(error.details){
-          if(_.isObject(error.details)){
-            errorMsg += JSON.stringify(error.details);
-          }
-          else{
-            errorMsg += t(error.details);
-          }
-        }
-        toastr.error(t("object_fields_function_recomputeFormulaValues_error", errorMsg));
-      }
-    });
-  },
-  recomputeFormulaValuesVisible: function(object_name, record_id, record_permissions){
-    if(!Creator.isSpaceAdmin()){
-        return false
-    }
-    var record = Creator.odata.get(object_name, record_id, "type");
-    if(record && record.type === "formula"){
-        return true;
-    }
-  },
-  recomputeSummaryValues: function (object_name, record_id, item_element) {
-    $("body").addClass("loading");
-    var userSession = Creator.USER_CONTEXT;
-    var authorization = "Bearer " + userSession.spaceId + "," + userSession.user.authToken;
-    $.ajax({
-      type: "POST",
-      url: Steedos.absoluteUrl("/api/v4/" + object_name + "/" + record_id + "/recomputeSummaryValues"),
-      data: JSON.stringify({}),
-      dataType: "json",
-      contentType: 'application/json',
-      beforeSend: function (XHR) {
-        XHR.setRequestHeader('Content-Type', 'application/json');
-        XHR.setRequestHeader('Authorization', authorization);
-      },
-      success: function (data) {
-        $("body").removeClass("loading");
-        if(data){
-          if(data.error){
-            toastr.error(t("object_fields_function_recomputeSummaryValues_error", t(data.error.reason)));
-          }
-          else{
-            toastr.success(t("object_fields_function_recomputeSummaryValues_success"));
-          }
-        }
-      },
-      error: function (XMLHttpRequest, textStatus, errorThrown) {
-        $("body").removeClass("loading");
-        var errorMsg = errorThrown;
-        var error = XMLHttpRequest.responseJSON.error;
-        if(error){
-          console.error("Recompute Summary Values Faild:", error);
-          if(error.reason){
-            errorMsg = error.reason;
-          }
-          else if(error.message){
-            errorMsg = error.message;
-          }
-          else{
-            errorMsg = error;
-          }
-        }
-        errorMsg = t(errorMsg);
-        if(error.details){
-          if(_.isObject(error.details)){
-            errorMsg += JSON.stringify(error.details);
-          }
-          else{
-            errorMsg += t(error.details);
-          }
-        }
-        toastr.error(t("object_fields_function_recomputeSummaryValues_error", errorMsg));
-      }
-    });
-  },
-  recomputeSummaryValuesVisible: function(object_name, record_id, record_permissions){
-    if(!Creator.isSpaceAdmin()){
-        return false
-    }
-    var record = Creator.odata.get(object_name, record_id, "type");
-    if(record && record.type === "summary"){
-        return true;
-    }
-  }
-}

package/main/default/server/object_layouts.action.js

@@ -1,31 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-03-28 09:35:34
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-16 16:50:45
- * @Description: 
- */
-module.exports = {
-  listenTo: 'objects',
-
-  createDefaultRecordView: function (object_name, record_id, item_element) {
-    if(object_name === 'objects' && this.record && this.record.record){
-      const objectApiName = this.record.record.name;
-      $("body").addClass("loading");
-      const res = Steedos.authRequest(`/service/api/@${objectApiName}/defUiSchema`, { type: 'post', async: false});
-      $("body").removeClass("loading");
-      if(res.error){
-        toastr.error(res.error);
-      }else{
-        toastr.success(t("Added successfully"));
-      }
-      FlowRouter.reload();
-    }
-  },
-  createDefaultRecordViewVisible: function(object_name, record_id, record_permissions, data){
-    if(!Creator.isSpaceAdmin() || data.record.name == 'users'){
-        return false
-    }
-    return true;
-  }
-}

package/main/default/server/object_layouts.layouts.action.js

@@ -1,80 +0,0 @@
-module.exports = {
-  listenTo: 'object_layouts',
-
-  customize: function (object_name, record_id, fields) {
-    let doc = Creator.odata.get(object_name, record_id);
-    var newRecord = _.pick(doc, Creator.getObjectFieldsName(object_name));
-    delete newRecord.is_system;
-    delete newRecord._id;
-    newRecord.from_code_id = record_id;
-    Creator.odata.insert(object_name, newRecord, function(result, error){
-        if(result){
-            FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
-        }
-    });
-  },
-  customizeVisible: function(object_name, record_id, record_permissions, data){
-    var record = data && data.record;
-    return Creator.baseObject.actions.standard_new.visible() && record.is_system;
-  },
-  /*
-  standard_new: function (object_name, record_id, fields){
-		var object = Creator.getObject(object_name);
-    var gridName = this.action.gridName;
-    // var isRelated = this.action.isRelated;
-    var relatedFieldName = this.action.relatedFieldName;
-    var masterRecordId = this.action.masterRecordId;
-    var initialValues = this.action.initialValues
-    if(!initialValues){
-      initialValues = {};
-      initialValues[relatedFieldName] = masterRecordId
-    }
-    const appId = Session.get("app_id");
-    const page = Steedos.Page.getPage('form', appId, object_name);
-    const title = t('New') + ' ' + object.label;
-    if (page && page.schema) {
-      const options = {
-        gridName: gridName
-      };
-      const fullScreenProps = {
-        "width": "96%", 
-        className: "!max-w-[96%]"
-      };
-      Steedos.Page.render(SteedosUI.Modal, page, Object.assign({}, options, {
-        appId: appId,
-        objectName: object_name,
-        title: title,
-        data: initialValues,
-      }), {
-        props: fullScreenProps
-      });
-    }
-  },
-  */
-  /*
-  standard_edit: function (object_name, record_id, fields){
-		var object = Creator.getObject(object_name);
-    var gridName = this.action.gridName;
-    const appId = Session.get("app_id");
-    const page = Steedos.Page.getPage('form', appId, object_name, record_id);
-    const title = t('Edit') + ' ' + object.label;
-    if (page && page.schema) {
-      const options = {
-        gridName: gridName
-      };
-      const fullScreenProps = {
-        "width": "96%", 
-        className: "!max-w-[96%]"
-      };
-      Steedos.Page.render(SteedosUI.Modal, page, Object.assign({}, options, {
-        appId: appId,
-        objectName: object_name,
-        title: title,
-        recordId: record_id
-      }), {
-        props: fullScreenProps
-      });
-    }
-  }
-  */
-}