@steedos/standard-object-database 2.6.6 → 2.6.7-beta.10

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

@@ -163,6 +163,10 @@ fields:
     label: Description
     help: 
     description: 
+  autonumber_enable_modify:
+    label: Allow modification of numbers
+    help: 
+    description: 
   formula:
     label: Formula
     help: This field must be filled when the field type is 'Autonumber' or 'Formula'
@@ -274,6 +278,10 @@ fields:
     label: Required
     help: 
     description: 
+  disable_thousands:
+    label: Don't display thousands separators
+    help: 
+    description:
   deleted_lookup_record_behavior:
     label: What to do if the lookup record is deleted?
     help: 

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

@@ -155,6 +155,10 @@ fields:
     label: 描述
     help: 
     description: 
+  autonumber_enable_modify:
+    label: 允许修改编号
+    help: 
+    description: 
   formula:
     label: 公式
     help: 字段类型为自动编号或公式时，必须填写此字段。
@@ -258,6 +262,10 @@ fields:
     label: 必填
     help: 
     description: 
+  disable_thousands:
+    label: 不显示千分符
+    help: 
+    description:
   deleted_lookup_record_behavior:
     label: 如果相关表记录被删除怎么办？
     help: 

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

@@ -30,6 +30,21 @@ fields:
     label: Shared to All Users
     help: 
     description: 
+  shared_to:
+    label: Who can see this list view?
+    help: 
+    description: 
+    options:
+      - label: Only I can view this list view.
+        value: mine
+      - label: This list view is available to all users.
+        value: space
+      - label: Share the list view with some organizations.
+        value: organizations 
+  shared_to_organizations:
+    label: Shared to which organizations?
+    help: 
+    description: 
   show_count:
     label: Show Record Count
     help: 
@@ -176,6 +191,7 @@ fields:
     description: 
 groups:
   advanced: Advanced
+  share_rules: Share Rules
   show_columns: Show Columns
   sort: Sort
   filters: Filters

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

@@ -27,6 +27,21 @@ fields:
     label: 共享视图到工作区
     help: 
     description: 
+  shared_to:
+    label: 谁可以查看此列表视图？
+    help: 
+    description: 
+    options:
+      - label: 只有我可以查看此列表视图
+        value: mine
+      - label: 所有用户均可以查看此列表视图
+        value: space
+      - label: 与组织共享列表视图
+        value: organizations 
+  shared_to_organizations:
+    label: 共享列表视图给哪些组织？
+    help: 
+    description: 
   show_count:
     label: 显示条目数
     help: 
@@ -171,6 +186,7 @@ fields:
     description: 
 groups:
   advanced: 高级
+  share_rules: 共享设置
   show_columns: 显示列
   sort: 排序
   filters: 过滤

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

@@ -94,6 +94,10 @@ fields:
     label: Enable Split
     help: 
     description: 
+  enable_lock_detail:
+    label: Enable Lock Details
+    help: When the main watch is locked all sub tables are read only.
+    description: 
   description:
     label: Description
     help: 

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

@@ -91,6 +91,10 @@ fields:
     label: 默认使用分栏视图
     help: 
     description: 
+  enable_lock_detail:
+    label: 锁定子表
+    help: 当主表锁定时，所有子表只读。
+    description: 
   description:
     label: 备注
     help: 

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

@@ -289,10 +289,15 @@ fields:
     label: Write requires master read
     type: boolean
     inlineHelpText: Sets the minimum sharing access level required on the master record to create, edit, or delete child records. This field applies only to master-detail or junction object custom field types. true—Allows users with “Read” access to the master record permission to create, edit, or delete child records. This setting makes sharing less restrictive. false—Allows users with “Read/Write” access to the master record permission to create, edit, or delete child records. This setting is more restrictive than true, and is the default value.
-    visible_on: "{{formData.type === 'master_detail' ? true: false}}"
+    visible_on: c
     sort_no: 200
     amis:
       disabledOn: "${is_system == true}"
+  autonumber_enable_modify:
+    label: 允许修改编号
+    type: boolean
+    visible_on: "{{formData.type === 'autonumber' ? true: false}}"
+    sort_no: 205
   formula:
     label: Formula
     type: textarea
@@ -689,6 +694,11 @@ fields:
     # group: Advanced
     visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
     sort_no: 272
+  disable_thousands:
+    type: boolean
+    label: 不显示千分符
+    sort_no: 273
+    visible_on: "{{['number','currency','percent'].indexOf(formData.type) > -1 ? true: false}}"
   deleted_lookup_record_behavior:
     type: select
     label: 如果相关表记录被删除怎么办？

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

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-13 13:28:02
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-05 13:35:32
  * @Description: 
  */
 const _ = require("underscore");
@@ -65,6 +65,17 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
       checkName(doc.name);
       if (!Steedos.isSpaceAdmin(doc.space, userId)) {
         doc.shared = false;
+        delete doc.shared_to;
+        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;
+      }
+      if(doc.shared_to !== "organizations"){
+        delete doc.shared_to_organizations;
       }
       doc.filters = transformFilters(doc.filters);
     }
@@ -79,8 +90,28 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
         checkName(modifier.$set.name);
       }
 
-      if (modifier.$set.shared && !Steedos.isSpaceAdmin(doc.space, userId)) {
+      if (!Steedos.isSpaceAdmin(doc.space, userId)) {
         modifier.$set.shared = false;
+        delete modifier.$set.shared_to;
+        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;
+      }
+      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){
         modifier.$set.filters = transformFilters(modifier.$set.filters);

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

@@ -38,6 +38,31 @@ fields:
   shared:
     label: Shared to All Users
     type: boolean
+    visible_on: "{{false}}"
+    group: share_rules
+  shared_to:
+    label: Who can see this list view?
+    type: select
+    defaultValue: mine
+    options:
+      - label: Only I can view this list view.
+        value: mine
+      - label: This list view is available to all users.
+        value: space
+      - label: Share the list view with some organizations.
+        value: organizations 
+    visible_on: "${global.user.is_space_admin}"
+    group: share_rules
+  shared_to_organizations:
+    label: Shared to which organizations?
+    type: lookup
+    reference_to: organizations
+    multiple: true
+    is_wide: true
+    depend_on:
+      - shared_to
+    visible_on: "${global.user.is_space_admin && shared_to ==='organizations'}"
+    group: share_rules
   show_count:
     label: Show Record Count
     type: boolean

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

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

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

@@ -154,6 +154,12 @@ fields:
     label: Enable Split
     group: Switch
     defaultValue: false
+  enable_lock_detail:
+    type: boolean
+    label: Enable Lock Details
+    inlineHelpText: When the main watch is locked all sub tables are read only.
+    group: Switch
+    defaultValue: false
   # enable_audit:
   #   type: boolean
   #   label: Enable Audit

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

@@ -180,7 +180,7 @@
             ],
             "id": "u:6a3b45d7adcf",
             "tabsMode": "vertical",
-            "className": "object-detail-tabs bg-white m-0 mt-2 border-y",
+            "className": "steedos-record-tabs bg-white mt-3 border-y",
             "toolbarClassName": "",
             "linksClassName": "",
             "contentClassName": "bg-white",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.6",
+    "version": "2.6.7-beta.10",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,9 +12,9 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/standard-objects": "2.6.6"
+        "@steedos/standard-objects": "2.6.7-beta.10"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "781cb961f46ab549821b119ec2da24056cf8c1d4"
+    "gitHead": "1361c449164e5a04d38a14295689bbff8eb76e38"
 }

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