@next-libs/cmdb-instances 7.11.1 → 7.12.1

package/dist/cjs/float-display-brick/FloatDisplayBrick.js

@@ -10,7 +10,7 @@ var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 const floatMaxLengthMatch = value => {
   var _value$match;
-  const pattern = /[0-9]+(.[0-9]{1,4})?/;
+  const pattern = /^-?\d+(.\d{1,4})?/;
   return (_value$match = value.match(pattern)) === null || _value$match === void 0 ? void 0 : _value$match[0];
 };
 exports.floatMaxLengthMatch = floatMaxLengthMatch;

package/dist/cjs/float-display-brick/FloatDisplayBrick.js.map

@@ -1 +1 @@
-{"version":3,"file":"FloatDisplayBrick.js","names":["floatMaxLengthMatch","value","pattern","match","FloatDisplayBrick","props","floatValue","regex","test","cursor"],"sources":["../../../src/float-display-brick/FloatDisplayBrick.tsx"],"sourcesContent":["import React from \"react\";\nimport { Tooltip } from \"antd\";\n\ninterface FloatDisplayBrickProps {\n  floatValue: number;\n}\nexport const floatMaxLengthMatch = (value: string): string => {\n  const pattern = /[0-9]+(.[0-9]{1,4})?/;\n  return value.match(pattern)?.[0];\n};\nexport function FloatDisplayBrick(\n  props: FloatDisplayBrickProps\n): React.ReactElement {\n  const { floatValue } = props;\n  const value = floatValue + \"\";\n  const regex = /^[0-9]+(.[0-9]{1,4})?$/gi;\n  return value && !regex.test(value) ? (\n    <Tooltip title={floatValue}>\n      <span style={{ cursor: \"pointer\" }} key={floatValue}>\n        {floatMaxLengthMatch(value)}\n      </span>\n    </Tooltip>\n  ) : (\n    <span>{floatValue}</span>\n  );\n}\n"],"mappings":";;;;;;;;AAAA;AACA;AAKO,MAAMA,mBAAmB,GAAIC,KAAa,IAAa;EAAA;EAC5D,MAAMC,OAAO,GAAG,sBAAsB;EACtC,uBAAOD,KAAK,CAACE,KAAK,CAACD,OAAO,CAAC,iDAApB,aAAuB,CAAC,CAAC;AAClC,CAAC;AAAC;AACK,SAASE,iBAAiB,CAC/BC,KAA6B,EACT;EACpB,MAAM;IAAEC;EAAW,CAAC,GAAGD,KAAK;EAC5B,MAAMJ,KAAK,GAAGK,UAAU,GAAG,EAAE;EAC7B,MAAMC,KAAK,GAAG,0BAA0B;EACxC,OAAON,KAAK,IAAI,CAACM,KAAK,CAACC,IAAI,CAACP,KAAK,CAAC,gBAChC,6BAAC,aAAO;IAAC,KAAK,EAAEK;EAAW,gBACzB;IAAM,KAAK,EAAE;MAAEG,MAAM,EAAE;IAAU,CAAE;IAAC,GAAG,EAAEH;EAAW,GACjDN,mBAAmB,CAACC,KAAK,CAAC,CACtB,CACC,gBAEV,2CAAOK,UAAU,CAClB;AACH"}
+{"version":3,"file":"FloatDisplayBrick.js","names":["floatMaxLengthMatch","value","pattern","match","FloatDisplayBrick","props","floatValue","regex","test","cursor"],"sources":["../../../src/float-display-brick/FloatDisplayBrick.tsx"],"sourcesContent":["import React from \"react\";\nimport { Tooltip } from \"antd\";\n\ninterface FloatDisplayBrickProps {\n  floatValue: number;\n}\nexport const floatMaxLengthMatch = (value: string): string => {\n  const pattern = /^-?\\d+(.\\d{1,4})?/;\n  return value.match(pattern)?.[0];\n};\nexport function FloatDisplayBrick(\n  props: FloatDisplayBrickProps\n): React.ReactElement {\n  const { floatValue } = props;\n  const value = floatValue + \"\";\n  const regex = /^[0-9]+(.[0-9]{1,4})?$/gi;\n  return value && !regex.test(value) ? (\n    <Tooltip title={floatValue}>\n      <span style={{ cursor: \"pointer\" }} key={floatValue}>\n        {floatMaxLengthMatch(value)}\n      </span>\n    </Tooltip>\n  ) : (\n    <span>{floatValue}</span>\n  );\n}\n"],"mappings":";;;;;;;;AAAA;AACA;AAKO,MAAMA,mBAAmB,GAAIC,KAAa,IAAa;EAAA;EAC5D,MAAMC,OAAO,GAAG,mBAAmB;EACnC,uBAAOD,KAAK,CAACE,KAAK,CAACD,OAAO,CAAC,iDAApB,aAAuB,CAAC,CAAC;AAClC,CAAC;AAAC;AACK,SAASE,iBAAiB,CAC/BC,KAA6B,EACT;EACpB,MAAM;IAAEC;EAAW,CAAC,GAAGD,KAAK;EAC5B,MAAMJ,KAAK,GAAGK,UAAU,GAAG,EAAE;EAC7B,MAAMC,KAAK,GAAG,0BAA0B;EACxC,OAAON,KAAK,IAAI,CAACM,KAAK,CAACC,IAAI,CAACP,KAAK,CAAC,gBAChC,6BAAC,aAAO;IAAC,KAAK,EAAEK;EAAW,gBACzB;IAAM,KAAK,EAAE;MAAEG,MAAM,EAAE;IAAU,CAAE;IAAC,GAAG,EAAEH;EAAW,GACjDN,mBAAmB,CAACC,KAAK,CAAC,CACtB,CACC,gBAEV,2CAAOK,UAAU,CAClB;AACH"}

package/dist/cjs/instance-list/InstanceList.js

@@ -374,12 +374,12 @@ function LegacyInstanceList(props) {
   } = {
     inModal: false
   }) => {
-    // 原来有隐藏逻辑，针对 APP、HOST、USER、USER_GROUP模型，默认字段特殊处理了，现产品要求干掉，统一取8个默认字段，也不区分是否是内置模型
+    // 针对 显示字段，默认优先拿排序的字段，再去拿属性字段
     const settings = inModal ? _constants2.CMDB_MODAL_FIELDS_SETTINGS : _constants2.CMDB_RESOURCE_FIELDS_SETTINGS;
-    const ignoredFields = settings.ignoredFields[modelData.objectId] || [];
-    let fieldIds = (0, _lodash.difference)((0, _lodash.uniq)((0, _lodash.map)(modelData.attrList, "id")), ignoredFields).slice(0, 8);
-    const hideModelData = modelData.view.hide_columns || [];
-    fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
+    const ignoredFields = (settings.ignoredFields[modelData.objectId] || []).concat(modelData.view.hide_columns || []);
+    const sortFields = modelData.view.attr_order || [];
+    const allFields = [...new Set([...sortFields, ...(0, _lodash.map)(modelData.attrList, "id")])];
+    const fieldIds = (0, _lodash.difference)(allFields, ignoredFields).slice(0, 8);
     return {
       fieldIds
     };