@next-libs/cmdb-instances 7.3.0 → 7.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +14 -3
- package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +15 -3
- package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
- package/dist/types/instance-detail/components/instance-relation-table-show/instance-relation-table-show.d.ts +2 -1
- package/package.json +4 -4
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.InstanceRelationTableShow = InstanceRelationTableShow;
|
|
8
8
|
exports.getRelationShowFields = getRelationShowFields;
|
|
9
|
+
exports.reOrderAttrs = reOrderAttrs;
|
|
9
10
|
var _react = _interopRequireDefault(require("react"));
|
|
10
11
|
var _cmdbUtils = require("@next-libs/cmdb-utils");
|
|
11
12
|
var _instanceListTable = require("../../../instance-list-table");
|
|
@@ -13,8 +14,18 @@ var _constants = require("../../../i18n/constants");
|
|
|
13
14
|
var _i18next = _interopRequireDefault(require("i18next"));
|
|
14
15
|
var _lodash = require("lodash");
|
|
15
16
|
var _InstanceListTableModule = _interopRequireDefault(require("../../../instance-list-table/InstanceListTable.module.css"));
|
|
16
|
-
function
|
|
17
|
-
return
|
|
17
|
+
function reOrderAttrs(fields, fieldOrder = []) {
|
|
18
|
+
return (0, _lodash.sortBy)(fields, field => {
|
|
19
|
+
const index = fieldOrder.indexOf(field);
|
|
20
|
+
return index === -1 ? fields.length : index;
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
function getRelationShowFields(defaultRelationFields, oppositeAttrList, attr_order = []) {
|
|
24
|
+
let showFields = oppositeAttrList;
|
|
25
|
+
if (defaultRelationFields !== null && defaultRelationFields !== void 0 && defaultRelationFields.length) {
|
|
26
|
+
showFields = reOrderAttrs(defaultRelationFields.map(item => item.startsWith("#") ? item.slice(1) : item), attr_order);
|
|
27
|
+
}
|
|
28
|
+
return showFields;
|
|
18
29
|
}
|
|
19
30
|
//istanbul ignore next
|
|
20
31
|
function InstanceRelationTableShow(props) {
|
|
@@ -31,7 +42,7 @@ function InstanceRelationTableShow(props) {
|
|
|
31
42
|
let oppositeModelData = (0, _cmdbUtils.modifyModelData)(modelDataMap[relationData.right_object_id]);
|
|
32
43
|
// 如果指定了relation_default_attr，则取里面的字段
|
|
33
44
|
const defaultRelationFields = (0, _lodash.get)(modelData, ["view", "relation_default_attr", relationData.__id]);
|
|
34
|
-
const fieldIds = getRelationShowFields(defaultRelationFields, oppositeModelData.attrList.map(attr => attr.id));
|
|
45
|
+
const fieldIds = getRelationShowFields(defaultRelationFields, oppositeModelData.attrList.map(attr => attr.id), (0, _lodash.get)(oppositeModelData, ["view", "attr_order"]));
|
|
35
46
|
//过滤掉视图不可见字段
|
|
36
47
|
const hideModelData = oppositeModelData.view.hide_columns || [];
|
|
37
48
|
oppositeModelData = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-relation-table-show.js","names":["getRelationShowFields","defaultRelationFields","oppositeAttrList","
|
|
1
|
+
{"version":3,"file":"instance-relation-table-show.js","names":["reOrderAttrs","fields","fieldOrder","sortBy","field","index","indexOf","length","getRelationShowFields","defaultRelationFields","oppositeAttrList","attr_order","showFields","map","item","startsWith","slice","InstanceRelationTableShow","props","modelDataMap","relationData","value","relationFieldUrlTemplate","paginationChange","total","relationTablePagination","modelData","left_object_id","oppositeModelData","modifyModelData","right_object_id","get","__id","fieldIds","attrList","attr","id","hideModelData","view","hide_columns","filter","includes","relation_list","left_id","right_id","display","list","pagination","isPagination","showSizeChanger","pageSizeOptions","onChange","page","pageSize","showTotal","totals","styles","totalText","i18n","t","NS_LIBS_CMDB_INSTANCES","K","PAGINATION_TOTAL_TEXT","PAGINATION_TOTAL_UNIT"],"sources":["../../../../../src/instance-detail/components/instance-relation-table-show/instance-relation-table-show.tsx"],"sourcesContent":["import React from \"react\";\nimport { Table } from \"antd\";\nimport {\n ModifiedModelObjectRelation,\n modifyModelData,\n} from \"@next-libs/cmdb-utils\";\nimport { CmdbModels } from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../../../instance-list-table\";\nimport { NS_LIBS_CMDB_INSTANCES, K } from \"../../../i18n/constants\";\nimport i18n from \"i18next\";\nimport { get, sortBy } from \"lodash\";\nimport styles from \"../../../instance-list-table/InstanceListTable.module.css\";\nexport interface InstanceRelationTableShowProps {\n modelDataMap: { [objectId: string]: CmdbModels.ModelCmdbObject };\n relationData: ModifiedModelObjectRelation;\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n value: any[];\n relationFieldUrlTemplate?: string;\n isPagination?: boolean;\n total?: number;\n relationTablePagination?: {\n current?: number;\n pageSize?: number;\n };\n paginationChange?: (\n page: number,\n pageSize: number,\n relationData: ModifiedModelObjectRelation\n ) => Promise<void>;\n}\nexport function reOrderAttrs(fields: string[], fieldOrder: string[] = []) {\n return sortBy(fields, (field) => {\n const index = fieldOrder.indexOf(field);\n return index === -1 ? fields.length : index;\n });\n}\nexport function getRelationShowFields(\n defaultRelationFields: string[],\n oppositeAttrList: string[],\n attr_order: string[] = []\n) {\n let showFields = oppositeAttrList;\n if (defaultRelationFields?.length) {\n showFields = reOrderAttrs(\n defaultRelationFields.map((item: string) =>\n item.startsWith(\"#\") ? item.slice(1) : item\n ),\n attr_order\n );\n }\n return showFields;\n}\n//istanbul ignore next\nexport function InstanceRelationTableShow(\n props: InstanceRelationTableShowProps\n): React.ReactElement {\n const {\n modelDataMap,\n relationData,\n value,\n relationFieldUrlTemplate,\n paginationChange,\n total,\n relationTablePagination,\n } = props;\n const modelData = modelDataMap[relationData.left_object_id];\n let oppositeModelData = modifyModelData(\n modelDataMap[relationData.right_object_id]\n );\n // 如果指定了relation_default_attr，则取里面的字段\n const defaultRelationFields = get(modelData, [\n \"view\",\n \"relation_default_attr\",\n relationData.__id,\n ]);\n\n const fieldIds = getRelationShowFields(\n defaultRelationFields,\n oppositeModelData.attrList.map((attr) => attr.id),\n get(oppositeModelData, [\"view\", \"attr_order\"])\n );\n //过滤掉视图不可见字段\n const hideModelData = oppositeModelData.view.hide_columns || [];\n oppositeModelData = {\n ...oppositeModelData,\n attrList: oppositeModelData.attrList.filter(\n (item: any) => !hideModelData.includes(item.id)\n ),\n relation_list: oppositeModelData.relation_list.filter(\n (item: any) =>\n !(\n (hideModelData.includes(item.left_id) &&\n item.left_object_id === props.relationData.right_object_id) ||\n (hideModelData.includes(item.right_id) &&\n item.right_object_id === props.relationData.right_object_id)\n )\n ),\n };\n\n return (\n <div style={{ display: \"grid\" }}>\n <InstanceListTable\n detailUrlTemplates={{\n [relationData.right_object_id]:\n \"/next-cmdb-instance-management/next/#{objectId}/instance/#{instanceId}\",\n }}\n idObjectMap={props.modelDataMap}\n modelData={oppositeModelData}\n instanceListData={{\n list: value,\n }}\n fieldIds={fieldIds}\n selectDisabled={true}\n sortDisabled={true}\n configProps={{\n pagination: props.isPagination\n ? {\n showSizeChanger: true,\n total: total,\n pageSizeOptions: [\"10\", \"20\", \"50\"],\n ...relationTablePagination,\n onChange: (page, pageSize) => {\n paginationChange(page, pageSize, relationData);\n },\n showTotal: (totals: number) => (\n <span className={styles.totalText}>\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_TEXT}`\n )}{\" \"}\n <strong className={styles.total}>{totals}</strong>{\" \"}\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_UNIT}`\n )}\n </span>\n ),\n }\n : false,\n }}\n target={\"_blank\"}\n ></InstanceListTable>\n </div>\n );\n}\n"],"mappings":"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"}
|
|
@@ -4,10 +4,22 @@ import { modifyModelData } from "@next-libs/cmdb-utils";
|
|
|
4
4
|
import { InstanceListTable } from "../../../instance-list-table";
|
|
5
5
|
import { NS_LIBS_CMDB_INSTANCES, K } from "../../../i18n/constants";
|
|
6
6
|
import i18n from "i18next";
|
|
7
|
-
import { get } from "lodash";
|
|
7
|
+
import { get, sortBy } from "lodash";
|
|
8
8
|
import styles from "../../../instance-list-table/InstanceListTable.module.css";
|
|
9
|
+
export function reOrderAttrs(fields) {
|
|
10
|
+
var fieldOrder = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
11
|
+
return sortBy(fields, field => {
|
|
12
|
+
var index = fieldOrder.indexOf(field);
|
|
13
|
+
return index === -1 ? fields.length : index;
|
|
14
|
+
});
|
|
15
|
+
}
|
|
9
16
|
export function getRelationShowFields(defaultRelationFields, oppositeAttrList) {
|
|
10
|
-
|
|
17
|
+
var attr_order = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
|
|
18
|
+
var showFields = oppositeAttrList;
|
|
19
|
+
if (defaultRelationFields !== null && defaultRelationFields !== void 0 && defaultRelationFields.length) {
|
|
20
|
+
showFields = reOrderAttrs(defaultRelationFields.map(item => item.startsWith("#") ? item.slice(1) : item), attr_order);
|
|
21
|
+
}
|
|
22
|
+
return showFields;
|
|
11
23
|
}
|
|
12
24
|
//istanbul ignore next
|
|
13
25
|
export function InstanceRelationTableShow(props) {
|
|
@@ -24,7 +36,7 @@ export function InstanceRelationTableShow(props) {
|
|
|
24
36
|
var oppositeModelData = modifyModelData(modelDataMap[relationData.right_object_id]);
|
|
25
37
|
// 如果指定了relation_default_attr，则取里面的字段
|
|
26
38
|
var defaultRelationFields = get(modelData, ["view", "relation_default_attr", relationData.__id]);
|
|
27
|
-
var fieldIds = getRelationShowFields(defaultRelationFields, oppositeModelData.attrList.map(attr => attr.id));
|
|
39
|
+
var fieldIds = getRelationShowFields(defaultRelationFields, oppositeModelData.attrList.map(attr => attr.id), get(oppositeModelData, ["view", "attr_order"]));
|
|
28
40
|
//过滤掉视图不可见字段
|
|
29
41
|
var hideModelData = oppositeModelData.view.hide_columns || [];
|
|
30
42
|
oppositeModelData = _objectSpread(_objectSpread({}, oppositeModelData), {}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-relation-table-show.js","names":["React","modifyModelData","InstanceListTable","NS_LIBS_CMDB_INSTANCES","K","i18n","get","styles","getRelationShowFields","defaultRelationFields","oppositeAttrList","
|
|
1
|
+
{"version":3,"file":"instance-relation-table-show.js","names":["React","modifyModelData","InstanceListTable","NS_LIBS_CMDB_INSTANCES","K","i18n","get","sortBy","styles","reOrderAttrs","fields","fieldOrder","field","index","indexOf","length","getRelationShowFields","defaultRelationFields","oppositeAttrList","attr_order","showFields","map","item","startsWith","slice","InstanceRelationTableShow","props","modelDataMap","relationData","value","relationFieldUrlTemplate","paginationChange","total","relationTablePagination","modelData","left_object_id","oppositeModelData","right_object_id","__id","fieldIds","attrList","attr","id","hideModelData","view","hide_columns","filter","includes","relation_list","left_id","right_id","display","list","pagination","isPagination","showSizeChanger","pageSizeOptions","onChange","page","pageSize","showTotal","totals","totalText","t","PAGINATION_TOTAL_TEXT","PAGINATION_TOTAL_UNIT"],"sources":["../../../../../src/instance-detail/components/instance-relation-table-show/instance-relation-table-show.tsx"],"sourcesContent":["import React from \"react\";\nimport { Table } from \"antd\";\nimport {\n ModifiedModelObjectRelation,\n modifyModelData,\n} from \"@next-libs/cmdb-utils\";\nimport { CmdbModels } from \"@next-sdk/cmdb-sdk\";\nimport { InstanceListTable } from \"../../../instance-list-table\";\nimport { NS_LIBS_CMDB_INSTANCES, K } from \"../../../i18n/constants\";\nimport i18n from \"i18next\";\nimport { get, sortBy } from \"lodash\";\nimport styles from \"../../../instance-list-table/InstanceListTable.module.css\";\nexport interface InstanceRelationTableShowProps {\n modelDataMap: { [objectId: string]: CmdbModels.ModelCmdbObject };\n relationData: ModifiedModelObjectRelation;\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n value: any[];\n relationFieldUrlTemplate?: string;\n isPagination?: boolean;\n total?: number;\n relationTablePagination?: {\n current?: number;\n pageSize?: number;\n };\n paginationChange?: (\n page: number,\n pageSize: number,\n relationData: ModifiedModelObjectRelation\n ) => Promise<void>;\n}\nexport function reOrderAttrs(fields: string[], fieldOrder: string[] = []) {\n return sortBy(fields, (field) => {\n const index = fieldOrder.indexOf(field);\n return index === -1 ? fields.length : index;\n });\n}\nexport function getRelationShowFields(\n defaultRelationFields: string[],\n oppositeAttrList: string[],\n attr_order: string[] = []\n) {\n let showFields = oppositeAttrList;\n if (defaultRelationFields?.length) {\n showFields = reOrderAttrs(\n defaultRelationFields.map((item: string) =>\n item.startsWith(\"#\") ? item.slice(1) : item\n ),\n attr_order\n );\n }\n return showFields;\n}\n//istanbul ignore next\nexport function InstanceRelationTableShow(\n props: InstanceRelationTableShowProps\n): React.ReactElement {\n const {\n modelDataMap,\n relationData,\n value,\n relationFieldUrlTemplate,\n paginationChange,\n total,\n relationTablePagination,\n } = props;\n const modelData = modelDataMap[relationData.left_object_id];\n let oppositeModelData = modifyModelData(\n modelDataMap[relationData.right_object_id]\n );\n // 如果指定了relation_default_attr，则取里面的字段\n const defaultRelationFields = get(modelData, [\n \"view\",\n \"relation_default_attr\",\n relationData.__id,\n ]);\n\n const fieldIds = getRelationShowFields(\n defaultRelationFields,\n oppositeModelData.attrList.map((attr) => attr.id),\n get(oppositeModelData, [\"view\", \"attr_order\"])\n );\n //过滤掉视图不可见字段\n const hideModelData = oppositeModelData.view.hide_columns || [];\n oppositeModelData = {\n ...oppositeModelData,\n attrList: oppositeModelData.attrList.filter(\n (item: any) => !hideModelData.includes(item.id)\n ),\n relation_list: oppositeModelData.relation_list.filter(\n (item: any) =>\n !(\n (hideModelData.includes(item.left_id) &&\n item.left_object_id === props.relationData.right_object_id) ||\n (hideModelData.includes(item.right_id) &&\n item.right_object_id === props.relationData.right_object_id)\n )\n ),\n };\n\n return (\n <div style={{ display: \"grid\" }}>\n <InstanceListTable\n detailUrlTemplates={{\n [relationData.right_object_id]:\n \"/next-cmdb-instance-management/next/#{objectId}/instance/#{instanceId}\",\n }}\n idObjectMap={props.modelDataMap}\n modelData={oppositeModelData}\n instanceListData={{\n list: value,\n }}\n fieldIds={fieldIds}\n selectDisabled={true}\n sortDisabled={true}\n configProps={{\n pagination: props.isPagination\n ? {\n showSizeChanger: true,\n total: total,\n pageSizeOptions: [\"10\", \"20\", \"50\"],\n ...relationTablePagination,\n onChange: (page, pageSize) => {\n paginationChange(page, pageSize, relationData);\n },\n showTotal: (totals: number) => (\n <span className={styles.totalText}>\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_TEXT}`\n )}{\" \"}\n <strong className={styles.total}>{totals}</strong>{\" \"}\n {i18n.t(\n `${NS_LIBS_CMDB_INSTANCES}:${K.PAGINATION_TOTAL_UNIT}`\n )}\n </span>\n ),\n }\n : false,\n }}\n target={\"_blank\"}\n ></InstanceListTable>\n </div>\n );\n}\n"],"mappings":"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"}
|
|
@@ -16,5 +16,6 @@ export interface InstanceRelationTableShowProps {
|
|
|
16
16
|
};
|
|
17
17
|
paginationChange?: (page: number, pageSize: number, relationData: ModifiedModelObjectRelation) => Promise<void>;
|
|
18
18
|
}
|
|
19
|
-
export declare function
|
|
19
|
+
export declare function reOrderAttrs(fields: string[], fieldOrder?: string[]): string[];
|
|
20
|
+
export declare function getRelationShowFields(defaultRelationFields: string[], oppositeAttrList: string[], attr_order?: string[]): string[];
|
|
20
21
|
export declare function InstanceRelationTableShow(props: InstanceRelationTableShowProps): React.ReactElement;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@next-libs/cmdb-instances",
|
|
3
|
-
"version": "7.3.
|
|
3
|
+
"version": "7.3.2",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
|
|
6
6
|
"license": "GPL-3.0",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"@next-core/brick-types": "^2.16.0",
|
|
39
39
|
"@next-libs/basic-components": "^5.3.3",
|
|
40
40
|
"@next-libs/cmdb-utils": "^3.3.4",
|
|
41
|
-
"@next-libs/code-editor-components": "^4.10.
|
|
42
|
-
"@next-libs/forms": "^3.
|
|
41
|
+
"@next-libs/code-editor-components": "^4.10.4",
|
|
42
|
+
"@next-libs/forms": "^3.5.0",
|
|
43
43
|
"@next-libs/storage": "^2.0.4",
|
|
44
44
|
"@next-sdk/cmdb-sdk": "^3.1.0",
|
|
45
45
|
"@next-sdk/permission-sdk": "^2.1.1",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"immutability-helper": "^3.1.1",
|
|
51
51
|
"marked": "^2.1.3"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "a7a18458af830c5184e76c0eed6df61d45463a51"
|
|
54
54
|
}
|