@next-core/brick-kit 2.122.10 → 2.122.11

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.122.11](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.10...@next-core/brick-kit@2.122.11) (2022-07-14)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 ## [2.122.10](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.9...@next-core/brick-kit@2.122.10) (2022-07-12)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -7958,7 +7958,7 @@
   }
 
   var formRenderer = "form-renderer.form-renderer";
-  var filterProperties = ["brick", "slots", "properties", "events", "if", "context", "bricks", "mountPoint"];
+  var filterProperties = ["instanceId", "brick", "slots", "properties", "events", "if", "context", "bricks", "mountPoint"];
 
   class Kernel {
     constructor() {
@@ -9073,7 +9073,20 @@
         brick: "div",
         slots: {
           "": {
-            bricks: formStoryboard,
+            bricks: [{
+              brick: "basic-bricks.micro-view",
+              properties: {
+                style: {
+                  padding: "12px"
+                }
+              },
+              slots: {
+                content: {
+                  bricks: formStoryboard,
+                  type: "bricks"
+                }
+              }
+            }],
             type: "bricks"
           }
         }
@@ -9093,20 +9106,31 @@
     }
   }
   function getDefaultProperties(_name, fields) {
-    var field = fields.filter(item => item.id === _name)[0];
-    var defaultValue = {};
+    var field = fields.filter(item => item.fieldId === _name)[0];
 
     if (field) {
-      switch (field.type) {
+      var defaultValue = {
+        brick: "forms.general-input",
+        properties: {
+          id: field.fieldId,
+          name: field.fieldId,
+          label: field.name,
+          readOnly: field.limit.includes("READONLY"),
+          required: field.limit.includes("REQUIRED"),
+          placeholder: field.description
+        }
+      };
+
+      switch (field.fieldType) {
         case "STRING":
           defaultValue = {
             brick: "forms.general-input",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               placeholder: field.description
             }
           };
@@ -9116,11 +9140,11 @@
           defaultValue = {
             brick: "forms.general-input-number",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               placeholder: field.description,
               precision: 0,
               inputBoxStyle: {
@@ -9134,11 +9158,11 @@
           defaultValue = {
             brick: "forms.general-switch",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required")
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED")
             }
           };
           break;
@@ -9147,11 +9171,11 @@
           defaultValue = {
             brick: "forms.general-input-number",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               placeholder: field.description,
               inputBoxStyle: {
                 width: "100%"
@@ -9160,15 +9184,15 @@
           };
           break;
 
-        case "ENUMERATED_SINGLE_OPTION":
+        case "ENUM":
           defaultValue = {
             brick: "forms.general-select",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               options: [{
                 label: "选项一",
                 value: 1
@@ -9184,15 +9208,15 @@
           };
           break;
 
-        case "SELECT_MULTIPLE_ENUMERATED_TYPE":
+        case "ENUMS":
           defaultValue = {
             brick: "forms.general-select",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               mode: "multiple",
               options: [{
                 label: "选项一",
@@ -9213,11 +9237,11 @@
           defaultValue = {
             brick: "forms.general-date-picker",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               placeholder: field.description
             }
           };
@@ -9227,11 +9251,11 @@
           defaultValue = {
             brick: "forms.general-date-picker",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               placeholder: field.description
             }
           };
@@ -9241,11 +9265,11 @@
           defaultValue = {
             brick: "forms.general-input",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED"),
               placeholder: field.description,
               pattern: /((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))/
             }
@@ -9253,56 +9277,59 @@
           break;
 
         case "JSON":
-          defaultValue = {};
+          defaultValue = {
+            brick: "forms.general-textarea",
+            properties: {
+              id: field.fieldId,
+              name: field.fieldId,
+              label: field.name
+            }
+          };
           break;
 
         case "ARRAY":
-          defaultValue = {};
-          break;
-
-        case "STRUCTURE":
           defaultValue = {
-            brick: "forms.cmdb-instance-select-panel",
+            brick: "forms.general-select",
             properties: {
-              id: field.id,
-              name: field.id,
-              label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required")
+              id: field.fieldId,
+              name: field.fieldId,
+              label: field.name
             }
           };
           break;
 
-        case "STRUCTURE_ARRAY":
+        case "STRUCTURE":
           defaultValue = {
             brick: "forms.cmdb-instance-select-panel",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required")
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED")
             }
           };
           break;
 
-        default:
+        case "STRUCTURE_ARRAY":
           defaultValue = {
-            brick: "forms.general-input",
+            brick: "forms.cmdb-instance-select-panel",
             properties: {
-              id: field.id,
-              name: field.id,
+              id: field.fieldId,
+              name: field.fieldId,
               label: field.name,
-              readOnly: field.limit.includes("readOnly"),
-              required: field.limit.includes("required"),
-              placeholder: field.description
+              readOnly: field.limit.includes("READONLY"),
+              required: field.limit.includes("REQUIRED")
             }
           };
           break;
       }
-    }
 
-    return defaultValue;
+      defaultValue.properties.dataset = {
+        testid: field.fieldId
+      };
+      return defaultValue;
+    } else return {};
   }
   function getStoryboard(datasource, result, fields) {
     var _loop = function (i) {
@@ -9320,7 +9347,9 @@
       });
       Object.keys(dataItem).forEach(item => {
         if (filterProperties.includes(item)) {
-          resultItem[item] = dataItem[item];
+          var _key = item === "instanceId" ? "iid" : item;
+
+          resultItem[_key] = dataItem[item];
         }
       });