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

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

@@ -213,39 +213,60 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
 
 (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: visible;
-          }
-
-          .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-Form-label{
-              display: none;
-          }
-          .defaultValue_field .defaultValue_field_formula_hidden .antd-FormulaPicker-input{
-              display: none;
-          }
-
+    var styleCss = $(`<style>
+      .defaultValue_field.steedos-defaultValue-flex-grow div:first-child {
+        /*有steedos-defaultValue-flex-grow样式类时才加上flex-grow，是为了排除掉html字段类型，因为html类型字段不可以配置flex-grow属性(配置为0或unset也不行)，否则html字段类型的顶部toolbar高度样式异常*/
+        flex-grow: 1;
+      }
+      
+      .defaultValue_field .defaultValue_field_formula {
+        /* margin: 4px; */
+      }
+      
+      .defaultValue_field .defaultValue_field_formula .antd-Form-label {
+        visibility: visible;
+      }
+      
+      .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.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden .antd-Form-label {
+        /*html字段类型默认值，显示为静态值编辑器时，因为移除了flex样式类，不再把amis公式配置按钮显示在右侧，而是换行显示，此时label不可以display: none，否则缩进不对*/
+        display: block;
+        visibility: hidden;
+      }
+      
+      .defaultValue_field .defaultValue_field_formula_hidden {
+        flex-grow: 0;
+      }
+      
+      .defaultValue_field .defaultValue_field_formula_hidden {
+        margin-left: 0.5rem;
+      }
+      
+      .defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden {
+        margin-left: 0px;
+      }
+      
+      .defaultValue_field .defaultValue_field_formula_hidden .antd-Form-label {
+        display: none;
+      }
+      
+      .defaultValue_field .defaultValue_field_formula_hidden .antd-FormulaPicker-input {
+        display: none;
+      }
       </style>`);
-      $("head").append(styleCss);
+    $("head").append(styleCss);
   } catch (error) {
-      console.log(error);
+    console.log(error);
   }
 })();

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

@@ -6,7 +6,7 @@ fields:
     label: 
     help: 
     description: 
-  change_date:
+  change_data:
     label: 
     help: 
     description: 

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

@@ -6,7 +6,7 @@ fields:
     label: 
     help: 
     description: 
-  change_date:
+  change_data:
     label: 
     help: 
     description: 

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

@@ -2,6 +2,10 @@ name: object_actions
 label: Object Action
 description: 
 fields:
+  description:
+    label: Description
+    help: 
+    description: 
   object:
     label: Object
     help: 

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

@@ -2,6 +2,10 @@ name: object_actions
 label: 操作按钮
 description: 
 fields:
+  description:
+    label: 备注
+    help: 
+    description: 
   object:
     label: 所属对象
     help: 

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

@@ -110,8 +110,12 @@ fields:
     label: Reference to field
     help: The value of the associated object saved to the current object field; For example, after object A is associated with object B, when A1 record is associated with B1 record, B1 record will be stored by default_ Save the ID in the A1 record. If the foreign key field is modified, the 'foreign key field' will be replaced_ Store the ID in the A1 record.
     description: The default is the primary key, and the default value is _id.
+  filters:
+    label: Lookup Relationship Filters Condition
+    help: When the field type is Lookup Relationship or Master Detail Relationship, filtering conditions can be configured for the field, filtering option list; The field values can be configured as formulas, and the fields referenced in the formulas need to be configured in Dependent Fields at the same time
+    description: 
   filtersFunction:
-    label: filters Function
+    label: Lookup Relationship Filters Function
     help: 
     description: 
   optionsFunction:
@@ -165,7 +169,7 @@ fields:
     description: 
   auto_fill_mapping:
     label: Auto Fill Mapping
-    help: When the data is selected, the field values in the reference object are automatically filled into the current form field according to the following mapping.
+    help: In a form, after you fill in one field, other fields are automatically filled according to preset rules. For example, in the New Payment history form, after selecting a contract, the amount of the contract is automatically filled into the payment amount field.
     description: 
   auto_fill_mapping.$:
     label: Auto Fill Mapping
@@ -383,6 +387,8 @@ fields:
     label: Enable Enhanced Lookup
     help: 
     description: 
+  is_customize:
+    label: Customize
 groups:
   external_data_source: External data source
   advanced: Advanced