@steedos/standard-object-database 2.7.0-beta.25 → 2.7.0-beta.27

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);
   }
 })();