@next-libs/cmdb-instances 6.5.1 → 6.6.1

package/dist/esm/struct-components/mockData.js

@@ -3,12 +3,14 @@ export var structData = {
   str: "string",
   int: 1000,
   ip: "0.0.0.0",
-  enum: "1",
+  enum1: "1",
+  enum2: "3",
   date: "2019-05-24",
   datetime: "2019-05-24 12:00:00",
   enums: ["1", "3"],
   float: 100.1,
   json: "666",
+  bool: true,
   json1: {
     test: "666"
   }
@@ -40,17 +42,22 @@ export var attribute = {
       type: "str"
     }, {
       id: "int",
-      name: "数组",
+      name: "整型",
       type: "int"
     }, {
       id: "ip",
       name: "IP地址",
       type: "ip"
     }, {
-      id: "enum",
-      name: "枚举",
+      id: "enum1",
+      name: "枚举(<6)",
       type: "enum",
       regex: ["1", "3", "5", "7", "9"]
+    }, {
+      id: "enum2",
+      name: "枚举(>=6)",
+      type: "enum",
+      regex: ["1", "3", "5", "7", "9", "11"]
     }, {
       id: "date",
       name: "日期",
@@ -68,6 +75,10 @@ export var attribute = {
       id: "float",
       name: "浮点型",
       type: "float"
+    }, {
+      id: "bool",
+      name: "布尔型",
+      type: "bool"
     }, {
       id: "json",
       name: "json",
@@ -78,4 +89,62 @@ export var attribute = {
       type: "json"
     }]
   }
+};
+export var attributeWithRegex = {
+  name: "结构体",
+  id: "struct",
+  value: {
+    type: "structs",
+    struct_define: [{
+      id: "arr",
+      name: "数组",
+      type: "arr",
+      regex: "^678"
+    }, {
+      id: "str",
+      name: "字符串",
+      type: "str",
+      regex: "^abc"
+    }, {
+      id: "int",
+      name: "整型",
+      type: "int",
+      regex: "10$"
+    }, {
+      id: "ip",
+      name: "IP地址",
+      type: "ip",
+      regex: "^((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)(\\[[^\\[\\],;\\s]{1,100}\\]|)$"
+    }, {
+      id: "enum1",
+      name: "枚举(<6)",
+      type: "enum",
+      regex: ["1", "3", "5", "7", "9"]
+    }, {
+      id: "enum2",
+      name: "枚举(>=6)",
+      type: "enum",
+      regex: ["1", "3", "5", "7", "9", "11"]
+    }, {
+      id: "enums",
+      name: "枚举多选",
+      type: "enums",
+      regex: ["1", "3", "5", "7", "9"]
+    }, {
+      id: "json",
+      name: "json",
+      type: "json",
+      regex: JSON.stringify({
+        type: "object",
+        properties: {
+          city: {
+            type: "string"
+          },
+          number: {
+            type: "number"
+          }
+        }
+      })
+    }]
+  }
 };

package/dist/types/model-attribute-form/ModelAttributeForm.d.ts

@@ -51,7 +51,7 @@ export declare class ModelAttributeForm extends Component<ModelAttributeFormProp
     private modelData;
     static defaultProps: {
         showCancelButton: boolean;
-        cancelType: "default" | "link" | "text" | "ghost" | "primary" | "dashed";
+        cancelType: "link" | "text" | "ghost" | "default" | "primary" | "dashed";
     };
     formItemProps: FormItemProps;
     constructor(props: ModelAttributeFormProps);

package/dist/types/struct-components/AddStructModal.d.ts

@@ -1,31 +1,10 @@
-import React, { ChangeEvent } from "react";
-import { Attribute, Structkey } from "./interfaces";
-import { RadioChangeEvent } from "antd/lib/radio";
-import { SelectValue } from "antd/lib/select";
+import React from "react";
+import { Attribute } from "./interfaces";
 export interface AddStructModalProps {
     structData?: any;
     attribute: Attribute;
-    handleStoreFunction: Function;
-    handleCancelFunction: Function;
+    handleStoreFunction: any;
+    handleCancelFunction: () => void;
     visible: boolean;
 }
-export interface AddStructModalState {
-    structData?: any;
-    showError?: boolean[];
-}
-export declare class AddStructModal extends React.Component<AddStructModalProps, AddStructModalState> {
-    constructor(props: AddStructModalProps);
-    componentDidUpdate(prevProps: AddStructModalProps): void;
-    hasRegex: (regex: any) => boolean;
-    hasValueWithRegex: (value: any, regex: any) => boolean;
-    handleValueChange: (e: SelectValue, define: Structkey) => void;
-    handleInputValueChange: (e: RadioChangeEvent | ChangeEvent<HTMLInputElement> | React.ChangeEvent<HTMLTextAreaElement>, define: any) => void;
-    validateRegex: (value: any, define: any, index: number) => void;
-    handleIpValueChange: (e: ChangeEvent<HTMLInputElement>, define: any, index: number) => void;
-    getEnumForm: (define: any, value: string) => JSX.Element;
-    validateJson: (err: any, index: number) => void;
-    getFormType: (define: Structkey, value: any, index: number) => JSX.Element;
-    handleStore: () => void;
-    handleCloseModal: () => void;
-    render(): JSX.Element;
-}
+export declare function AddStructModal(props: AddStructModalProps): React.ReactElement;

package/dist/types/struct-components/interfaces.d.ts

@@ -25,3 +25,16 @@ export interface Attribute {
     tips?: string;
     description?: string;
 }
+export declare enum StructDefineType {
+    STRING = "str",
+    INTEGER = "int",
+    ENUM = "enum",
+    ENUMS = "enums",
+    ARR = "arr",
+    DATE = "date",
+    DATETIME = "datetime",
+    IP = "ip",
+    FLOAT = "float",
+    BOOLEAN = "bool",
+    JSON = "json"
+}

package/dist/types/struct-components/mockData.d.ts

@@ -4,12 +4,14 @@ export declare const structData: {
     str: string;
     int: number;
     ip: string;
-    enum: string;
+    enum1: string;
+    enum2: string;
     date: string;
     datetime: string;
     enums: string[];
     float: number;
     json: string;
+    bool: boolean;
     json1: {
         test: string;
     };
@@ -25,7 +27,23 @@ export declare const structData2: {
     enums: string[];
     float: number;
 };
-export declare const structList: {
+export declare const structList: ({
+    arr: string[];
+    str: string;
+    int: number;
+    ip: string;
+    enum1: string;
+    enum2: string;
+    date: string;
+    datetime: string;
+    enums: string[];
+    float: number;
+    json: string;
+    bool: boolean;
+    json1: {
+        test: string;
+    };
+} | {
     arr: string[];
     str: string;
     int: number;
@@ -35,5 +53,6 @@ export declare const structList: {
     datetime: string;
     enums: string[];
     float: number;
-}[];
+})[];
 export declare const attribute: Attribute;
+export declare const attributeWithRegex: Attribute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-libs/cmdb-instances",
-  "version": "6.5.1",
+  "version": "6.6.1",
   "description": "> TODO: description",
   "homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
   "license": "GPL-3.0",
@@ -36,10 +36,10 @@
   },
   "dependencies": {
     "@next-core/brick-types": "^2.16.0",
-    "@next-libs/basic-components": "^3.2.0",
+    "@next-libs/basic-components": "^3.2.3",
     "@next-libs/cmdb-utils": "^3.0.2",
-    "@next-libs/code-editor-components": "^4.0.4",
-    "@next-libs/forms": "^3.2.2",
+    "@next-libs/code-editor-components": "^4.0.7",
+    "@next-libs/forms": "^3.2.5",
     "@next-libs/storage": "^2.0.2",
     "@next-sdk/cmdb-sdk": "^2.1.1",
     "@next-sdk/permission-sdk": "^2.1.1",
@@ -50,5 +50,5 @@
     "immutability-helper": "^3.1.1",
     "marked": "^2.1.3"
   },
-  "gitHead": "51e1257313e395767998c67d5fc411b7ff776aff"
+  "gitHead": "3b343ce2f9cab18091539c81f62517b792621f6e"
 }