@next-libs/cmdb-instances 7.27.2 → 7.28.0

package/dist/cjs/instance-list-drawer/InstanceListDrawer.js

@@ -47,15 +47,12 @@ function InstanceListDrawer(props) {
     }, _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.BACK}`)));
   };
   const handleRelationMoreIconClick = record => {
-    var _record$record$left_i;
     setState({
       open: true,
       objectId: record.objectId,
       drawerTitle: record.left_name,
       query: {
-        instanceId: {
-          $in: (record === null || record === void 0 ? void 0 : (_record$record$left_i = record[record.left_id]) === null || _record$record$left_i === void 0 ? void 0 : _record$record$left_i.map(v => v.instanceId)) || []
-        }
+        [`${record.right_id}.instanceId`]: record.instanceId
       }
     });
   };

package/dist/cjs/instance-list-drawer/InstanceListDrawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"InstanceListDrawer.js","names":["_react","_interopRequireWildcard","require","_antd","_i18next","_interopRequireDefault","_constants","_InstanceList","_i18n","_brickKit","addResourceBundle","reducer","prevState","updatedProperty","DEFAULT_RELATION_LIMIT","InstanceListDrawer","props","_ref","_props$relationLimit","_getRuntime$getMiscSe","_props$drawerZIndex","state","setState","useReducer","open","objectId","drawerTitle","query","handleClose","renderFooter","default","createElement","Fragment","Button","onClick","type","i18n","t","NS_LIBS_CMDB_INSTANCES","K","BACK","handleRelationMoreIconClick","record","_record$record$left_i","left_name","instanceId","$in","left_id","map","v","_relationLimit","relationLimit","getRuntime","getMiscSettings","defaultRelationLimit","LegacyInstanceListWrapper","_extends2","onRelationMoreIconClick","Drawer","title","visible","width","drawerWidth","onClose","destroyOnClose","footer","zIndex","drawerZIndex","footerStyle","background","detailUrlTemplates","presetConfigs","selectDisabled","ipCopy","target","relatedToMe","relatedToMeDisabled","searchDisabled","sortDisabled","advancedSearchDisabled","aliveHostsDisabled","moreButtonsDisabled","showFixedHeader","showTooltip","relationLinkDisabled","showSizeChanger","useExternalCmdbApi","externalSourceId","useAutoDiscoveryProvider","useInstanceArchiveProvider","saveFieldsBackend"],"sources":["../../../src/instance-list-drawer/InstanceListDrawer.tsx"],"sourcesContent":["import React, { useReducer } from \"react\";\nimport { Button, Drawer } from \"antd\";\nimport i18n from \"i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport {\n  LegacyInstanceListWrapper,\n  InstanceListProps,\n} from \"../instance-list/InstanceList\";\nimport { addResourceBundle } from \"../i18n\";\nimport { getRuntime } from \"@next-core/brick-kit\";\naddResourceBundle();\n\nexport interface InstanceListDrawerProps extends InstanceListProps {\n  drawerZIndex?: number;\n  drawerWidth?: number;\n}\n/* istanbul ignore next */\nconst reducer = (\n  prevState: InstanceListDrawerState,\n  updatedProperty: Partial<InstanceListDrawerState>\n): InstanceListDrawerState => {\n  return {\n    ...prevState,\n    ...updatedProperty,\n  };\n};\n\nconst DEFAULT_RELATION_LIMIT = 5;\n\ninterface InstanceListDrawerState {\n  open: boolean;\n  objectId: string;\n  drawerTitle: string;\n  query: Record<string, any>;\n}\n\nexport function InstanceListDrawer(\n  props: InstanceListDrawerProps\n): React.ReactElement {\n  const [state, setState] = useReducer(reducer, {\n    open: false,\n    objectId: null,\n    drawerTitle: \"\",\n    query: null,\n  });\n\n  /* istanbul ignore next */\n  const handleClose = (): void => {\n    setState({\n      open: false,\n      drawerTitle: \"\",\n    });\n  };\n\n  const renderFooter = (): React.ReactElement => {\n    return (\n      <>\n        <Button\n          data-testid={\"back-button\"}\n          onClick={handleClose}\n          type=\"default\"\n        >\n          {i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.BACK}`)}\n        </Button>\n      </>\n    );\n  };\n  const handleRelationMoreIconClick = (record: Record<string, any>): void => {\n    setState({\n      open: true,\n      objectId: record.objectId,\n      drawerTitle: record.left_name,\n      query: {\n        instanceId: {\n          $in: record?.[record.left_id]?.map((v: any) => v.instanceId) || [],\n        },\n      },\n    });\n  };\n\n  const _relationLimit =\n    props.relationLimit ??\n    (getRuntime().getMiscSettings()?.defaultRelationLimit as number) ??\n    DEFAULT_RELATION_LIMIT;\n  return (\n    <>\n      <LegacyInstanceListWrapper\n        {...props}\n        onRelationMoreIconClick={handleRelationMoreIconClick}\n        relationLimit={_relationLimit}\n      />\n      <Drawer\n        title={state.drawerTitle}\n        visible={state.open}\n        width={props.drawerWidth || 900}\n        onClose={handleClose}\n        destroyOnClose={true}\n        footer={renderFooter()}\n        zIndex={props.drawerZIndex ?? 1000}\n        footerStyle={{ background: \"var(--color-fill-bg-base-3)\" }}\n      >\n        <InstanceListDrawer\n          objectId={state.objectId}\n          onRelationMoreIconClick={handleRelationMoreIconClick}\n          relationLimit={_relationLimit}\n          detailUrlTemplates={props.detailUrlTemplates}\n          presetConfigs={{ query: state.query }}\n          selectDisabled={true}\n          ipCopy={props.ipCopy}\n          target={props.target}\n          relatedToMe={props.relatedToMe}\n          relatedToMeDisabled={props.relatedToMeDisabled}\n          searchDisabled={props.searchDisabled}\n          sortDisabled={props.sortDisabled}\n          advancedSearchDisabled={props.advancedSearchDisabled}\n          aliveHostsDisabled={props.aliveHostsDisabled}\n          moreButtonsDisabled={props.moreButtonsDisabled}\n          showFixedHeader={props.showFixedHeader}\n          showTooltip={props.showTooltip}\n          relationLinkDisabled={props.relationLinkDisabled}\n          showSizeChanger={props.showSizeChanger}\n          useExternalCmdbApi={props.useExternalCmdbApi}\n          externalSourceId={props.externalSourceId}\n          useAutoDiscoveryProvider={props.useAutoDiscoveryProvider}\n          useInstanceArchiveProvider={props.useInstanceArchiveProvider}\n          saveFieldsBackend={props.saveFieldsBackend}\n        />\n      </Drawer>\n    </>\n  );\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"InstanceListDrawer.js","names":["_react","_interopRequireWildcard","require","_antd","_i18next","_interopRequireDefault","_constants","_InstanceList","_i18n","_brickKit","addResourceBundle","reducer","prevState","updatedProperty","DEFAULT_RELATION_LIMIT","InstanceListDrawer","props","_ref","_props$relationLimit","_getRuntime$getMiscSe","_props$drawerZIndex","state","setState","useReducer","open","objectId","drawerTitle","query","handleClose","renderFooter","default","createElement","Fragment","Button","onClick","type","i18n","t","NS_LIBS_CMDB_INSTANCES","K","BACK","handleRelationMoreIconClick","record","left_name","right_id","instanceId","_relationLimit","relationLimit","getRuntime","getMiscSettings","defaultRelationLimit","LegacyInstanceListWrapper","_extends2","onRelationMoreIconClick","Drawer","title","visible","width","drawerWidth","onClose","destroyOnClose","footer","zIndex","drawerZIndex","footerStyle","background","detailUrlTemplates","presetConfigs","selectDisabled","ipCopy","target","relatedToMe","relatedToMeDisabled","searchDisabled","sortDisabled","advancedSearchDisabled","aliveHostsDisabled","moreButtonsDisabled","showFixedHeader","showTooltip","relationLinkDisabled","showSizeChanger","useExternalCmdbApi","externalSourceId","useAutoDiscoveryProvider","useInstanceArchiveProvider","saveFieldsBackend"],"sources":["../../../src/instance-list-drawer/InstanceListDrawer.tsx"],"sourcesContent":["import React, { useReducer } from \"react\";\nimport { Button, Drawer } from \"antd\";\nimport i18n from \"i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport {\n  LegacyInstanceListWrapper,\n  InstanceListProps,\n} from \"../instance-list/InstanceList\";\nimport { addResourceBundle } from \"../i18n\";\nimport { getRuntime } from \"@next-core/brick-kit\";\naddResourceBundle();\n\nexport interface InstanceListDrawerProps extends InstanceListProps {\n  drawerZIndex?: number;\n  drawerWidth?: number;\n}\n/* istanbul ignore next */\nconst reducer = (\n  prevState: InstanceListDrawerState,\n  updatedProperty: Partial<InstanceListDrawerState>\n): InstanceListDrawerState => {\n  return {\n    ...prevState,\n    ...updatedProperty,\n  };\n};\n\nconst DEFAULT_RELATION_LIMIT = 5;\n\ninterface InstanceListDrawerState {\n  open: boolean;\n  objectId: string;\n  drawerTitle: string;\n  query: Record<string, any>;\n}\n\nexport function InstanceListDrawer(\n  props: InstanceListDrawerProps\n): React.ReactElement {\n  const [state, setState] = useReducer(reducer, {\n    open: false,\n    objectId: null,\n    drawerTitle: \"\",\n    query: null,\n  });\n\n  /* istanbul ignore next */\n  const handleClose = (): void => {\n    setState({\n      open: false,\n      drawerTitle: \"\",\n    });\n  };\n\n  const renderFooter = (): React.ReactElement => {\n    return (\n      <>\n        <Button\n          data-testid={\"back-button\"}\n          onClick={handleClose}\n          type=\"default\"\n        >\n          {i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.BACK}`)}\n        </Button>\n      </>\n    );\n  };\n  const handleRelationMoreIconClick = (record: Record<string, any>): void => {\n    setState({\n      open: true,\n      objectId: record.objectId,\n      drawerTitle: record.left_name,\n      query: {\n        [`${record.right_id}.instanceId`]: record.instanceId,\n      },\n    });\n  };\n\n  const _relationLimit =\n    props.relationLimit ??\n    (getRuntime().getMiscSettings()?.defaultRelationLimit as number) ??\n    DEFAULT_RELATION_LIMIT;\n  return (\n    <>\n      <LegacyInstanceListWrapper\n        {...props}\n        onRelationMoreIconClick={handleRelationMoreIconClick}\n        relationLimit={_relationLimit}\n      />\n      <Drawer\n        title={state.drawerTitle}\n        visible={state.open}\n        width={props.drawerWidth || 900}\n        onClose={handleClose}\n        destroyOnClose={true}\n        footer={renderFooter()}\n        zIndex={props.drawerZIndex ?? 1000}\n        footerStyle={{ background: \"var(--color-fill-bg-base-3)\" }}\n      >\n        <InstanceListDrawer\n          objectId={state.objectId}\n          onRelationMoreIconClick={handleRelationMoreIconClick}\n          relationLimit={_relationLimit}\n          detailUrlTemplates={props.detailUrlTemplates}\n          presetConfigs={{ query: state.query }}\n          selectDisabled={true}\n          ipCopy={props.ipCopy}\n          target={props.target}\n          relatedToMe={props.relatedToMe}\n          relatedToMeDisabled={props.relatedToMeDisabled}\n          searchDisabled={props.searchDisabled}\n          sortDisabled={props.sortDisabled}\n          advancedSearchDisabled={props.advancedSearchDisabled}\n          aliveHostsDisabled={props.aliveHostsDisabled}\n          moreButtonsDisabled={props.moreButtonsDisabled}\n          showFixedHeader={props.showFixedHeader}\n          showTooltip={props.showTooltip}\n          relationLinkDisabled={props.relationLinkDisabled}\n          showSizeChanger={props.showSizeChanger}\n          useExternalCmdbApi={props.useExternalCmdbApi}\n          externalSourceId={props.externalSourceId}\n          useAutoDiscoveryProvider={props.useAutoDiscoveryProvider}\n          useInstanceArchiveProvider={props.useInstanceArchiveProvider}\n          saveFieldsBackend={props.saveFieldsBackend}\n        />\n      </Drawer>\n    </>\n  );\n}\n"],"mappings":";;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AAIA,IAAAM,KAAA,GAAAN,OAAA;AACA,IAAAO,SAAA,GAAAP,OAAA;AACA,IAAAQ,uBAAiB,EAAC,CAAC;AAMnB;AACA,MAAMC,OAAO,GAAGA,CACdC,SAAkC,EAClCC,eAAiD,KACrB;EAC5B,OAAO;IACL,GAAGD,SAAS;IACZ,GAAGC;EACL,CAAC;AACH,CAAC;AAED,MAAMC,sBAAsB,GAAG,CAAC;AASzB,SAASC,kBAAkBA,CAChCC,KAA8B,EACV;EAAA,IAAAC,IAAA,EAAAC,oBAAA,EAAAC,qBAAA,EAAAC,mBAAA;EACpB,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,iBAAU,EAACZ,OAAO,EAAE;IAC5Ca,IAAI,EAAE,KAAK;IACXC,QAAQ,EAAE,IAAI;IACdC,WAAW,EAAE,EAAE;IACfC,KAAK,EAAE;EACT,CAAC,CAAC;;EAEF;EACA,MAAMC,WAAW,GAAGA,CAAA,KAAY;IAC9BN,QAAQ,CAAC;MACPE,IAAI,EAAE,KAAK;MACXE,WAAW,EAAE;IACf,CAAC,CAAC;EACJ,CAAC;EAED,MAAMG,YAAY,GAAGA,CAAA,KAA0B;IAC7C,oBACE7B,MAAA,CAAA8B,OAAA,CAAAC,aAAA,CAAA/B,MAAA,CAAA8B,OAAA,CAAAE,QAAA,qBACEhC,MAAA,CAAA8B,OAAA,CAAAC,aAAA,CAAC5B,KAAA,CAAA8B,MAAM;MACL,eAAa,aAAc;MAC3BC,OAAO,EAAEN,WAAY;MACrBO,IAAI,EAAC;IAAS,GAEbC,gBAAI,CAACC,CAAC,CAAC,GAAGC,iCAAsB,IAAIC,YAAC,CAACC,IAAI,EAAE,CACvC,CACR,CAAC;EAEP,CAAC;EACD,MAAMC,2BAA2B,GAAIC,MAA2B,IAAW;IACzEpB,QAAQ,CAAC;MACPE,IAAI,EAAE,IAAI;MACVC,QAAQ,EAAEiB,MAAM,CAACjB,QAAQ;MACzBC,WAAW,EAAEgB,MAAM,CAACC,SAAS;MAC7BhB,KAAK,EAAE;QACL,CAAC,GAAGe,MAAM,CAACE,QAAQ,aAAa,GAAGF,MAAM,CAACG;MAC5C;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMC,cAAc,IAAA7B,IAAA,IAAAC,oBAAA,GAClBF,KAAK,CAAC+B,aAAa,cAAA7B,oBAAA,cAAAA,oBAAA,IAAAC,qBAAA,GAClB,IAAA6B,oBAAU,EAAC,CAAC,CAACC,eAAe,CAAC,CAAC,cAAA9B,qBAAA,uBAA9BA,qBAAA,CAAgC+B,oBAAoB,cAAAjC,IAAA,cAAAA,IAAA,GACrDH,sBAAsB;EACxB,oBACEd,MAAA,CAAA8B,OAAA,CAAAC,aAAA,CAAA/B,MAAA,CAAA8B,OAAA,CAAAE,QAAA,qBACEhC,MAAA,CAAA8B,OAAA,CAAAC,aAAA,CAACxB,aAAA,CAAA4C,yBAAyB,MAAAC,SAAA,CAAAtB,OAAA,MACpBd,KAAK;IACTqC,uBAAuB,EAAEZ,2BAA4B;IACrDM,aAAa,EAAED;EAAe,EAC/B,CAAC,eACF9C,MAAA,CAAA8B,OAAA,CAAAC,aAAA,CAAC5B,KAAA,CAAAmD,MAAM;IACLC,KAAK,EAAElC,KAAK,CAACK,WAAY;IACzB8B,OAAO,EAAEnC,KAAK,CAACG,IAAK;IACpBiC,KAAK,EAAEzC,KAAK,CAAC0C,WAAW,IAAI,GAAI;IAChCC,OAAO,EAAE/B,WAAY;IACrBgC,cAAc,EAAE,IAAK;IACrBC,MAAM,EAAEhC,YAAY,CAAC,CAAE;IACvBiC,MAAM,GAAA1C,mBAAA,GAAEJ,KAAK,CAAC+C,YAAY,cAAA3C,mBAAA,cAAAA,mBAAA,GAAI,IAAK;IACnC4C,WAAW,EAAE;MAAEC,UAAU,EAAE;IAA8B;EAAE,gBAE3DjE,MAAA,CAAA8B,OAAA,CAAAC,aAAA,CAAChB,kBAAkB;IACjBU,QAAQ,EAAEJ,KAAK,CAACI,QAAS;IACzB4B,uBAAuB,EAAEZ,2BAA4B;IACrDM,aAAa,EAAED,cAAe;IAC9BoB,kBAAkB,EAAElD,KAAK,CAACkD,kBAAmB;IAC7CC,aAAa,EAAE;MAAExC,KAAK,EAAEN,KAAK,CAACM;IAAM,CAAE;IACtCyC,cAAc,EAAE,IAAK;IACrBC,MAAM,EAAErD,KAAK,CAACqD,MAAO;IACrBC,MAAM,EAAEtD,KAAK,CAACsD,MAAO;IACrBC,WAAW,EAAEvD,KAAK,CAACuD,WAAY;IAC/BC,mBAAmB,EAAExD,KAAK,CAACwD,mBAAoB;IAC/CC,cAAc,EAAEzD,KAAK,CAACyD,cAAe;IACrCC,YAAY,EAAE1D,KAAK,CAAC0D,YAAa;IACjCC,sBAAsB,EAAE3D,KAAK,CAAC2D,sBAAuB;IACrDC,kBAAkB,EAAE5D,KAAK,CAAC4D,kBAAmB;IAC7CC,mBAAmB,EAAE7D,KAAK,CAAC6D,mBAAoB;IAC/CC,eAAe,EAAE9D,KAAK,CAAC8D,eAAgB;IACvCC,WAAW,EAAE/D,KAAK,CAAC+D,WAAY;IAC/BC,oBAAoB,EAAEhE,KAAK,CAACgE,oBAAqB;IACjDC,eAAe,EAAEjE,KAAK,CAACiE,eAAgB;IACvCC,kBAAkB,EAAElE,KAAK,CAACkE,kBAAmB;IAC7CC,gBAAgB,EAAEnE,KAAK,CAACmE,gBAAiB;IACzCC,wBAAwB,EAAEpE,KAAK,CAACoE,wBAAyB;IACzDC,0BAA0B,EAAErE,KAAK,CAACqE,0BAA2B;IAC7DC,iBAAiB,EAAEtE,KAAK,CAACsE;EAAkB,CAC5C,CACK,CACR,CAAC;AAEP","ignoreList":[]}

package/dist/cjs/instance-list-table/DisplaySettingsModal.js

@@ -10,8 +10,18 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _constants = require("../i18n/constants");
 var _DisplaySettings = require("./DisplaySettings");
+var _SortSettings = require("./SortSettings");
 var _brickKit = require("@next-core/brick-kit");
 var _icons = require("@ant-design/icons");
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+
+const sortField = (dataSource = [], order) => {
+  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.sort((a, b) => {
+    const indexA = order.indexOf(a);
+    const indexB = order.indexOf(b);
+    return indexA - indexB;
+  });
+};
 function DisplaySettingsModal(props) {
   const {
     visible,
@@ -23,13 +33,18 @@ function DisplaySettingsModal(props) {
     defaultFields,
     extraDisabledField,
     extraDisabledFields,
+    sortFields,
     onOk,
     onCancel
   } = props;
   const {
     t
   } = (0, _reactI18next.useTranslation)(_constants.NS_LIBS_CMDB_INSTANCES);
-  const [nextFields, setNextFields] = (0, _react.useState)(currentFields);
+  const sortAttrList = sortFields ? sortFields.map(v => v.field) : [];
+  const sortCurrentFields = sortField(currentFields, sortAttrList);
+  const [nextFields, setNextFields] = (0, _react.useState)(sortCurrentFields);
+  const [sortSettingsVisible, setSortSettingsVisible] = (0, _react.useState)(false);
+  const [originalNextFields, setOriginalNextFields] = (0, _react.useState)(sortCurrentFields);
   const count = (0, _react.useMemo)(() => nextFields === null || nextFields === void 0 ? void 0 : nextFields.filter(v => v !== "_object_id").length, [nextFields]);
   const handleReset = () => {
     const fields = defaultFields ? defaultFields.slice() : [];
@@ -40,22 +55,24 @@ function DisplaySettingsModal(props) {
     });
   };
   const handleCancel = () => {
-    setNextFields(currentFields ? [...currentFields] : []);
+    setNextFields(sortCurrentFields ? [...sortCurrentFields] : []);
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
+  const handleSortFields = () => {
+    setSortSettingsVisible(true);
+    setOriginalNextFields(nextFields ? [...nextFields] : []);
+  };
   const handleDropdownMenuClick = e => {
-    // istanbul ignore next
     if (e.key === "restore-default") {
       handleReset();
     } else {
-      // istanbul ignore next
       // 管理员将现在选中的字段设置为默认显示, 不会影响到当前列表展示字段，所以需要类似【取消】操作重置字段。
       props === null || props === void 0 ? void 0 : props.onOk({
         fields: nextFields,
         isReset: false,
         isAdminSetDisplay: true
       });
-      setNextFields(currentFields ? [...currentFields] : []);
+      setNextFields(sortCurrentFields ? [...sortCurrentFields] : []);
     }
   };
   const showIsAdminSetDefault = (0, _brickKit.getAuth)().isAdmin;
@@ -67,7 +84,18 @@ function DisplaySettingsModal(props) {
     key: "restore-default",
     onClick: handleDropdownMenuClick
   }, t(_constants.K.RESTORE_DEFAULT)));
-  return /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  const handleSortEnd = data => {
+    setNextFields(data);
+  };
+  const handleSortSettingCancel = () => {
+    setSortSettingsVisible(false);
+    setNextFields(originalNextFields ? [...originalNextFields] : []);
+  };
+  const handleSortSettingOk = () => {
+    setSortSettingsVisible(false);
+    setNextFields(nextFields ? [...nextFields] : []);
+  };
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
     title: t(_constants.K.DISPLAY_SETTINGS),
     visible: visible,
     footer: /*#__PURE__*/_react.default.createElement("div", {
@@ -93,11 +121,11 @@ function DisplaySettingsModal(props) {
     }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
       type: "text",
       onClick: handleCancel,
-      style: {
-        marginRight: 10
-      },
       "data-testid": "cancel-button"
     }, t(_constants.K.CANCEL)), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      onClick: handleSortFields,
+      "data-testid": "sort-settings-button"
+    }, t(_constants.K.SORT_SETTINGS)), /*#__PURE__*/_react.default.createElement(_antd.Button, {
       type: "primary",
       onClick: () => props === null || props === void 0 ? void 0 : props.onOk({
         fields: nextFields
@@ -116,6 +144,18 @@ function DisplaySettingsModal(props) {
     extraDisabledField: extraDisabledField,
     extraDisabledFields: extraDisabledFields,
     onChange: fields => setNextFields(fields)
-  }));
+  })), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+    title: t(_constants.K.SORT_SETTINGS),
+    visible: sortSettingsVisible,
+    destroyOnClose: true,
+    centered: true,
+    onCancel: handleSortSettingCancel,
+    onOk: handleSortSettingOk
+  }, /*#__PURE__*/_react.default.createElement(_SortSettings.SortSettings, {
+    rowKey: "id",
+    modelData: modelData,
+    currentFields: nextFields,
+    onSortEnd: handleSortEnd
+  })));
 }
 //# sourceMappingURL=DisplaySettingsModal.js.map

package/dist/cjs/instance-list-table/DisplaySettingsModal.js.map

@@ -1 +1 @@
-{"version":3,"file":"DisplaySettingsModal.js","names":["_antd","require","_react","_interopRequireWildcard","_reactI18next","_constants","_DisplaySettings","_brickKit","_icons","DisplaySettingsModal","props","visible","objectId","modelData","saveFieldsBackend","useExternalCmdbApi","currentFields","defaultFields","extraDisabledField","extraDisabledFields","onOk","onCancel","t","useTranslation","NS_LIBS_CMDB_INSTANCES","nextFields","setNextFields","useState","count","useMemo","filter","v","length","handleReset","fields","slice","isReset","handleCancel","handleDropdownMenuClick","e","key","isAdminSetDisplay","showIsAdminSetDefault","getAuth","isAdmin","dropdownMenuItems","default","createElement","Menu","Item","disabled","onClick","K","DEFAULT_DISPLAY","RESTORE_DEFAULT","Modal","title","DISPLAY_SETTINGS","footer","style","display","Dropdown","overlay","placement","trigger","Button","type","icon","EllipsisOutlined","marginLeft","marginRight","CANCEL","CONFIRM","destroyOnClose","width","centered","DisplaySettings","onChange"],"sources":["../../../src/instance-list-table/DisplaySettingsModal.tsx"],"sourcesContent":["import { Button, Modal, Dropdown, Menu } from \"antd\";\nimport React, { useMemo, useState } from \"react\";\nimport { useTranslation } from \"react-i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport { DisplaySettings, DisplaySettingsProps } from \"./DisplaySettings\";\nimport { getAuth } from \"@next-core/brick-kit\";\nimport { EllipsisOutlined } from \"@ant-design/icons\";\n\nexport interface DisplaySettingsModalData {\n  fields: string[];\n  isReset?: boolean;\n  isAdminSetDisplay?: boolean;\n}\n\nexport interface DisplaySettingsModalProps extends DisplaySettingsProps {\n  visible?: boolean;\n  defaultFields?: string[];\n  saveFieldsBackend?: boolean;\n  useExternalCmdbApi?: boolean;\n  onOk?(data: DisplaySettingsModalData): void;\n  onCancel?(): void;\n}\n\nexport function DisplaySettingsModal(\n  props: DisplaySettingsModalProps\n): React.ReactElement {\n  const {\n    visible,\n    objectId,\n    modelData,\n    saveFieldsBackend,\n    useExternalCmdbApi,\n    currentFields,\n    defaultFields,\n    extraDisabledField,\n    extraDisabledFields,\n    onOk,\n    onCancel,\n  } = props;\n  const { t } = useTranslation(NS_LIBS_CMDB_INSTANCES);\n  const [nextFields, setNextFields] = useState<string[]>(currentFields);\n  const count = useMemo(\n    () => nextFields?.filter((v) => v !== \"_object_id\").length,\n    [nextFields]\n  );\n\n  const handleReset = (): void => {\n    const fields = defaultFields ? defaultFields.slice() : [];\n\n    setNextFields(fields);\n    onOk?.({ fields, isReset: true });\n  };\n\n  const handleCancel = (): void => {\n    setNextFields(currentFields ? [...currentFields] : []);\n    onCancel?.();\n  };\n\n  const handleDropdownMenuClick = (e: any): void => {\n    // istanbul ignore next\n    if (e.key === \"restore-default\") {\n      handleReset();\n    } else {\n      // istanbul ignore next\n      // 管理员将现在选中的字段设置为默认显示, 不会影响到当前列表展示字段，所以需要类似【取消】操作重置字段。\n      props?.onOk({\n        fields: nextFields,\n        isReset: false,\n        isAdminSetDisplay: true,\n      });\n      setNextFields(currentFields ? [...currentFields] : []);\n    }\n  };\n\n  const showIsAdminSetDefault = getAuth().isAdmin;\n\n  const dropdownMenuItems = (\n    <Menu>\n      <Menu.Item\n        key=\"set-default-display\"\n        disabled={count === 0}\n        onClick={handleDropdownMenuClick}\n      >\n        {t(K.DEFAULT_DISPLAY)}\n      </Menu.Item>\n      <Menu.Item key=\"restore-default\" onClick={handleDropdownMenuClick}>\n        {t(K.RESTORE_DEFAULT)}\n      </Menu.Item>\n    </Menu>\n  );\n  return (\n    <Modal\n      title={t(K.DISPLAY_SETTINGS)}\n      visible={visible}\n      footer={\n        <div style={{ display: \"flex\" }}>\n          {showIsAdminSetDefault && saveFieldsBackend && !useExternalCmdbApi ? (\n            <Dropdown\n              overlay={dropdownMenuItems}\n              placement=\"topLeft\"\n              trigger={[\"click\"]}\n              data-testid=\"admin-set-display-dropdown\"\n            >\n              <Button type=\"default\" icon={<EllipsisOutlined />}></Button>\n            </Dropdown>\n          ) : (\n            <div>\n              <Button\n                type=\"default\"\n                onClick={handleReset}\n                data-testid=\"reset-button\"\n              >\n                {t(K.RESTORE_DEFAULT)}\n              </Button>\n            </div>\n          )}\n          <div style={{ marginLeft: \"auto\" }}>\n            <Button\n              type=\"text\"\n              onClick={handleCancel}\n              style={{ marginRight: 10 }}\n              data-testid=\"cancel-button\"\n            >\n              {t(K.CANCEL)}\n            </Button>\n            <Button\n              type=\"primary\"\n              onClick={() => props?.onOk({ fields: nextFields })}\n              disabled={count === 0}\n              data-testid=\"ok-button\"\n            >\n              {t(K.CONFIRM)}\n            </Button>\n          </div>\n        </div>\n      }\n      onCancel={handleCancel}\n      destroyOnClose={true}\n      width={780}\n      centered={true}\n    >\n      <DisplaySettings\n        objectId={objectId}\n        modelData={modelData}\n        currentFields={nextFields}\n        extraDisabledField={extraDisabledField}\n        extraDisabledFields={extraDisabledFields}\n        onChange={(fields) => setNextFields(fields)}\n      />\n    </Modal>\n  );\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"DisplaySettingsModal.js","names":["_antd","require","_react","_interopRequireWildcard","_reactI18next","_constants","_DisplaySettings","_SortSettings","_brickKit","_icons","sortField","dataSource","order","sort","a","b","indexA","indexOf","indexB","DisplaySettingsModal","props","visible","objectId","modelData","saveFieldsBackend","useExternalCmdbApi","currentFields","defaultFields","extraDisabledField","extraDisabledFields","sortFields","onOk","onCancel","t","useTranslation","NS_LIBS_CMDB_INSTANCES","sortAttrList","map","v","field","sortCurrentFields","nextFields","setNextFields","useState","sortSettingsVisible","setSortSettingsVisible","originalNextFields","setOriginalNextFields","count","useMemo","filter","length","handleReset","fields","slice","isReset","handleCancel","handleSortFields","handleDropdownMenuClick","e","key","isAdminSetDisplay","showIsAdminSetDefault","getAuth","isAdmin","dropdownMenuItems","default","createElement","Menu","Item","disabled","onClick","K","DEFAULT_DISPLAY","RESTORE_DEFAULT","handleSortEnd","data","handleSortSettingCancel","handleSortSettingOk","Fragment","Modal","title","DISPLAY_SETTINGS","footer","style","display","Dropdown","overlay","placement","trigger","Button","type","icon","EllipsisOutlined","marginLeft","CANCEL","SORT_SETTINGS","CONFIRM","destroyOnClose","width","centered","DisplaySettings","onChange","SortSettings","rowKey","onSortEnd"],"sources":["../../../src/instance-list-table/DisplaySettingsModal.tsx"],"sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport { Button, Modal, Dropdown, Menu } from \"antd\";\nimport React, { useMemo, useState } from \"react\";\nimport { useTranslation } from \"react-i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport { DisplaySettings, DisplaySettingsProps } from \"./DisplaySettings\";\nimport { SortSettings } from \"./SortSettings\";\nimport { getAuth } from \"@next-core/brick-kit\";\nimport { EllipsisOutlined } from \"@ant-design/icons\";\n\nexport interface DisplaySettingsModalData {\n  fields: string[];\n  isReset?: boolean;\n  isAdminSetDisplay?: boolean;\n}\n\nexport interface DisplaySettingsModalProps extends DisplaySettingsProps {\n  visible?: boolean;\n  defaultFields?: string[];\n  saveFieldsBackend?: boolean;\n  useExternalCmdbApi?: boolean;\n  sortFields?: { field: string; order: number }[];\n  onOk?(data: DisplaySettingsModalData): void;\n  onCancel?(): void;\n}\n\nconst sortField = (dataSource: string[] = [], order: string[]) => {\n  return dataSource?.sort((a: string, b: string) => {\n    const indexA = order.indexOf(a);\n    const indexB = order.indexOf(b);\n    return indexA - indexB;\n  });\n};\nexport function DisplaySettingsModal(\n  props: DisplaySettingsModalProps\n): React.ReactElement {\n  const {\n    visible,\n    objectId,\n    modelData,\n    saveFieldsBackend,\n    useExternalCmdbApi,\n    currentFields,\n    defaultFields,\n    extraDisabledField,\n    extraDisabledFields,\n    sortFields,\n    onOk,\n    onCancel,\n  } = props;\n\n  const { t } = useTranslation(NS_LIBS_CMDB_INSTANCES);\n  const sortAttrList = sortFields ? sortFields.map((v) => v.field) : [];\n  const sortCurrentFields = sortField(currentFields, sortAttrList);\n\n  const [nextFields, setNextFields] = useState<string[]>(sortCurrentFields);\n  const [sortSettingsVisible, setSortSettingsVisible] =\n    useState<boolean>(false);\n  const [originalNextFields, setOriginalNextFields] =\n    useState<string[]>(sortCurrentFields);\n\n  const count = useMemo(\n    () => nextFields?.filter((v) => v !== \"_object_id\").length,\n    [nextFields]\n  );\n\n  const handleReset = (): void => {\n    const fields = defaultFields ? defaultFields.slice() : [];\n    setNextFields(fields);\n    onOk?.({ fields, isReset: true });\n  };\n\n  const handleCancel = (): void => {\n    setNextFields(sortCurrentFields ? [...sortCurrentFields] : []);\n    onCancel?.();\n  };\n\n  const handleSortFields = (): void => {\n    setSortSettingsVisible(true);\n    setOriginalNextFields(nextFields ? [...nextFields] : []);\n  };\n\n  const handleDropdownMenuClick = (e: any): void => {\n    if (e.key === \"restore-default\") {\n      handleReset();\n    } else {\n      // 管理员将现在选中的字段设置为默认显示, 不会影响到当前列表展示字段，所以需要类似【取消】操作重置字段。\n      props?.onOk({\n        fields: nextFields,\n        isReset: false,\n        isAdminSetDisplay: true,\n      });\n      setNextFields(sortCurrentFields ? [...sortCurrentFields] : []);\n    }\n  };\n\n  const showIsAdminSetDefault = getAuth().isAdmin;\n\n  const dropdownMenuItems = (\n    <Menu>\n      <Menu.Item\n        key=\"set-default-display\"\n        disabled={count === 0}\n        onClick={handleDropdownMenuClick}\n      >\n        {t(K.DEFAULT_DISPLAY)}\n      </Menu.Item>\n      <Menu.Item key=\"restore-default\" onClick={handleDropdownMenuClick}>\n        {t(K.RESTORE_DEFAULT)}\n      </Menu.Item>\n    </Menu>\n  );\n\n  const handleSortEnd = (data: any): void => {\n    setNextFields(data);\n  };\n\n  const handleSortSettingCancel = (): void => {\n    setSortSettingsVisible(false);\n    setNextFields(originalNextFields ? [...originalNextFields] : []);\n  };\n\n  const handleSortSettingOk = (): void => {\n    setSortSettingsVisible(false);\n    setNextFields(nextFields ? [...nextFields] : []);\n  };\n\n  return (\n    <>\n      <Modal\n        title={t(K.DISPLAY_SETTINGS)}\n        visible={visible}\n        footer={\n          <div style={{ display: \"flex\" }}>\n            {showIsAdminSetDefault &&\n            saveFieldsBackend &&\n            !useExternalCmdbApi ? (\n              <Dropdown\n                overlay={dropdownMenuItems}\n                placement=\"topLeft\"\n                trigger={[\"click\"]}\n                data-testid=\"admin-set-display-dropdown\"\n              >\n                <Button type=\"default\" icon={<EllipsisOutlined />}></Button>\n              </Dropdown>\n            ) : (\n              <div>\n                <Button\n                  type=\"default\"\n                  onClick={handleReset}\n                  data-testid=\"reset-button\"\n                >\n                  {t(K.RESTORE_DEFAULT)}\n                </Button>\n              </div>\n            )}\n            <div style={{ marginLeft: \"auto\" }}>\n              <Button\n                type=\"text\"\n                onClick={handleCancel}\n                data-testid=\"cancel-button\"\n              >\n                {t(K.CANCEL)}\n              </Button>\n              <Button\n                onClick={handleSortFields}\n                data-testid=\"sort-settings-button\"\n              >\n                {t(K.SORT_SETTINGS)}\n              </Button>\n              <Button\n                type=\"primary\"\n                onClick={() => props?.onOk({ fields: nextFields })}\n                disabled={count === 0}\n                data-testid=\"ok-button\"\n              >\n                {t(K.CONFIRM)}\n              </Button>\n            </div>\n          </div>\n        }\n        onCancel={handleCancel}\n        destroyOnClose={true}\n        width={780}\n        centered={true}\n      >\n        <DisplaySettings\n          objectId={objectId}\n          modelData={modelData}\n          currentFields={nextFields}\n          extraDisabledField={extraDisabledField}\n          extraDisabledFields={extraDisabledFields}\n          onChange={(fields) => setNextFields(fields)}\n        />\n      </Modal>\n      <Modal\n        title={t(K.SORT_SETTINGS)}\n        visible={sortSettingsVisible}\n        destroyOnClose={true}\n        centered={true}\n        onCancel={handleSortSettingCancel}\n        onOk={handleSortSettingOk}\n      >\n        <SortSettings\n          rowKey=\"id\"\n          modelData={modelData}\n          currentFields={nextFields}\n          onSortEnd={handleSortEnd}\n        />\n      </Modal>\n    </>\n  );\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/cjs/instance-list-table/InstanceListTable.js

@@ -29,6 +29,7 @@ var _CmdbUrlLink = require("../cmdb-url-link/CmdbUrlLink");
 var _FloatDisplayBrick = require("../float-display-brick/FloatDisplayBrick");
 var _JsonDisplayBrick = require("../json-display-brick/JsonDisplayBrick");
 var _XmlDisplayBrick = require("../xml-display-brick/XmlDisplayBrick");
+var _TableTooltip = require("./TableTooltip");
 // const { Paragraph } = Typography;
 var SortOrder;
 (function (SortOrder) {
@@ -695,7 +696,7 @@ class LegacyInstanceListTable extends _react.default.Component {
         if (instances && instances.length > 0) {
           const objectId = relation[`${sides.that}_object_id`];
           const leftName = relation[`${sides.this}_name`];
-          const leftId = relation[`${sides.this}_id`];
+          const rightId = relation[`${sides.that}_id`];
           const nameKeys = (0, _cmdbUtils.getInstanceNameKeys)(this.props.idObjectMap[objectId]);
           let detailUrlTemplate;
           if (this.props.detailUrlTemplates) {
@@ -739,23 +740,14 @@ class LegacyInstanceListTable extends _react.default.Component {
             className: (0, _classnames.default)(_InstanceListTableModule.default.instanceListTableRelationWrapper)
           }, /*#__PURE__*/_react.default.createElement("span", {
             className: _InstanceListTableModule.default.instanceListTableRelationText
-          }, instanceNodes), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-            title: _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.RELATION_INSTANCE_TOOLTIP}`),
-            placement: "top"
-          }, /*#__PURE__*/_react.default.createElement(_basicComponents.GeneralIcon, {
-            icon: {
-              lib: "easyops",
-              category: "patch-manager",
-              icon: "patch-list"
-            },
-            iconClassName: _InstanceListTableModule.default.relationMoreIcon,
+          }, instanceNodes), /*#__PURE__*/_react.default.createElement(_TableTooltip.TableTooltip, {
             onClick: () => this.handleRelationMoreIconClick({
               ...record,
               objectId,
               left_name: leftName,
-              left_id: leftId
+              right_id: rightId
             })
-          })));
+          }));
           return instanceNodesWrapper;
         } else {
           return null;