@steedos/standard-object-database 2.6.7-beta.15 → 2.6.7-beta.16

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

@@ -278,8 +278,8 @@ fields:
     label: Required
     help: 
     description: 
-  disable_thousands:
-    label: Don't display thousands separators
+  enable_thousands:
+    label: Display thousands separators
     help: 
     description:
   deleted_lookup_record_behavior:

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

@@ -262,8 +262,8 @@ fields:
     label: 必填
     help: 
     description: 
-  disable_thousands:
-    label: 不显示千分符
+  enable_thousands:
+    label: 显示千分符
     help: 
     description:
   deleted_lookup_record_behavior:

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

@@ -103,6 +103,10 @@ fields:
     label: 每页显示数量
     help: 
     description:
+  is_system:
+    label: 系统
+    help: 
+    description:
 listviews:
   all:
     label: 所有

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

@@ -694,11 +694,12 @@ fields:
     # group: Advanced
     visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
     sort_no: 272
-  disable_thousands:
+  enable_thousands:
     type: boolean
-    label: 不显示千分符
+    label: 显示千分符
     sort_no: 273
     visible_on: "{{['number','currency','percent'].indexOf(formData.type) > -1 ? true: false}}"
+    defaultValue: true
   deleted_lookup_record_behavior:
     type: select
     label: 如果相关表记录被删除怎么办？

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

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-02-05 13:35:32
+ * @LastEditTime: 2024-02-19 17:28:37
  * @Description: 
  */
 const _ = require("underscore");
@@ -64,16 +64,10 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
     todo: function (userId, doc) {
       checkName(doc.name);
       if (!Steedos.isSpaceAdmin(doc.space, userId)) {
-        doc.shared = false;
-        delete doc.shared_to;
+        doc.shared_to = "mine";
         delete doc.shared_to_organizations;
       }
-      if(doc.shared_to === "mine" || doc.shared_to === "organizations"){
-        doc.shared = false;
-      }
-      else if(doc.shared_to === "space"){
-        doc.shared = true;
-      }
+      delete doc.shared;
       if(doc.shared_to !== "organizations"){
         delete doc.shared_to_organizations;
       }
@@ -85,32 +79,23 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
     when: "before.update",
     todo: function (userId, doc, fieldNames, modifier, options) {
       modifier.$set = modifier.$set || {}
+      if (!modifier.$unset) {
+        modifier.$unset = {};
+      }
 
       if(_.has(modifier.$set, "name") && modifier.$set.name != doc.name){
         checkName(modifier.$set.name);
       }
 
       if (!Steedos.isSpaceAdmin(doc.space, userId)) {
-        modifier.$set.shared = false;
-        delete modifier.$set.shared_to;
+        modifier.$set.shared_to = "mine";
         delete modifier.$set.shared_to_organizations;
-        if (!modifier.$unset) {
-          modifier.$unset = {};
-        }
-        modifier.$unset.shared_to = 1;
         modifier.$unset.shared_to_organizations = 1;
       }
-      if(modifier.$set.shared_to === "mine" || modifier.$set.shared_to === "organizations"){
-        modifier.$set.shared = false;
-      }
-      else if(modifier.$set.shared_to === "space"){
-        modifier.$set.shared = true;
-      }
+      delete modifier.$set.shared;
+      modifier.$unset.shared = 1;
       if(modifier.$set.shared_to && modifier.$set.shared_to !== "organizations"){
         delete modifier.$set.shared_to_organizations;
-        if (!modifier.$unset) {
-          modifier.$unset = {};
-        }
         modifier.$unset.shared_to_organizations = 1;
       }
       if(modifier.$set.filters){

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

@@ -44,6 +44,7 @@ fields:
     label: Who can see this list view?
     type: select
     defaultValue: mine
+    required: true
     options:
       - label: Only I can view this list view.
         value: mine
@@ -334,7 +335,7 @@ list_views:
     columns:
       - label
       - name
-      - shared
+      - shared_to
       - owner
       - modified
       - is_enable
@@ -345,7 +346,7 @@ list_views:
     columns:
       - label
       - name
-      - shared
+      - shared_to
       - owner
       - modified
       - is_system

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

@@ -1,4 +1,5 @@
 var objectql = require('@steedos/objectql');
+const { DEFAULT_FIELD } = require('@steedos/metadata-core');
 const register = require('@steedos/metadata-registrar');
 const clone = require('clone');
 const defaultDatasourceName = 'default';
@@ -69,6 +70,11 @@ function getObjectFields(object) {
     var fields = {};
     var table_fields = {};
     _.forEach(object_fields, function (f) {
+        _.each(DEFAULT_FIELD, (value, key) => {
+            if (!_.has(f, key)) {
+                f[key] = value;
+            }
+        });
         var cf_arr, child_fields;
         if (/^[a-zA-Z_]\w*(\.\$\.\w+){1}[a-zA-Z0-9]*$/.test(f.name)) {
             cf_arr = f.name.split(".$.");

package/main/default/objects/objects.object.js

@@ -337,7 +337,6 @@ let objectTriggers = {
                 space: doc.space,
                 owner: userId,
                 object_name: doc.name,
-                shared: true,
                 shared_to: "space",
                 filter_scope: "space",
                 columns: [{field: 'name'}],
@@ -354,7 +353,6 @@ let objectTriggers = {
                 space: doc.space,
                 owner: userId,
                 object_name: doc.name,
-                shared: true,
                 shared_to: "space",
                 filter_scope: "space",
                 columns:  [{field: 'name'}]

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

@@ -127,8 +127,6 @@
                               "recordId": "",
                               "mode": "edit",
                               "defaultData": {
-                                "name": "",
-                                "shared": false,
                                 "object": "${designObjectName}"
                               },
                               "fieldsExtend": {
@@ -227,8 +225,6 @@
                                   "recordId": "${_id}",
                                   "mode": "edit",
                                   "defaultData": {
-                                    "name": "",
-                                    "shared": false,
                                     "object": "${designObjectName}"
                                   },
                                   "fields": [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.7-beta.15",
+    "version": "2.6.7-beta.16",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,9 +12,10 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/standard-objects": "2.6.7-beta.15"
+        "@steedos/metadata-core": "2.6.7-beta.16",
+        "@steedos/standard-objects": "2.6.7-beta.16"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "95b4e4191a00b65589ef3c56d645778e50fcdd59"
+    "gitHead": "98dd35e5fc1b9a697e15dc9285c4d4069c15efad"
 }

package/package.service.js

@@ -116,7 +116,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', 'disable_thousands', 'autonumber_enable_modify']);
+					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']);
 				}
                 return object.update(id, data, userSession)
 			},