venus-design 0.6.5 → 0.6.6

package/dist/VenusTable/handleVenusTableFunctions.d.ts

@@ -42,4 +42,4 @@ export declare const assemblyFilterData: (column: VenusSelectDataVo[]) => VenusE
 /**
  * 警告标识
  */
-export declare const handleConflictFlag: (column: VenusColumns, record: any, actions: any) => React.JSX.Element | undefined;
+export declare const handleConflictFlag: (column: VenusColumns, record: any, actions: any) => React.JSX.Element | null;

package/dist/VenusTable/handleVenusTableFunctions.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
-import { dataToEnum, IconFont, isNotNullVenus, storage, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE } from "./..";
+import { dataToEnum, IconFont, storage, VENUS_TABLE_COLUMNENUM_TYPE, VENUS_TABLE_COLUMNFILTER_TYPE, VENUS_TABLE_COLUMNRENDER_TYPE } from "./..";
 import { VENUS_ConflictFlag_Image_Url } from "./staticAttr";
 
 /**
@@ -172,29 +172,37 @@ export var assemblyFilterData = function assemblyFilterData(column) {
  * 警告标识
  */
 export var handleConflictFlag = function handleConflictFlag(column, record, actions) {
-  var conflictList = record.conflictList;
-  if (isNotNullVenus(conflictList) && conflictList.length > 0) {
+  var _record$conflictList;
+  var conflictList = (_record$conflictList = record.conflictList) !== null && _record$conflictList !== void 0 ? _record$conflictList : [];
+
+  // 互斥过滤
+  var hasAdjusting = conflictList.some(function (v) {
+    return v.code === 'VC_ADJUSTING';
+  });
+  var filtered = hasAdjusting ? conflictList.filter(function (v) {
+    return v.code !== 'VC_ADJUSTED';
+  }) : conflictList;
+  if (!filtered.length) return null;
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, filtered.map(function (v) {
     return /*#__PURE__*/React.createElement("div", {
+      key: v.code
+    },
+    //@ts-ignore
+    VENUS_ConflictFlag_Image_Url[v.iconPath] && /*#__PURE__*/React.createElement(_Tooltip, {
+      title: v.nameTips || v.name,
+      placement: "top",
+      color: "geekblue"
+    }, /*#__PURE__*/React.createElement(IconFont, {
       style: {
-        display: "flex"
+        fontSize: 20
       }
-    }, conflictList.map(function (v) {
-      return [/*#__PURE__*/React.createElement("div", null,
       //@ts-ignore
-      VENUS_ConflictFlag_Image_Url[v.iconPath] != undefined ? /*#__PURE__*/React.createElement(_Tooltip, {
-        title: v.nameTips || v.name,
-        placement: "top",
-        color: "geekblue",
-        key: "green"
-      },
-      /*#__PURE__*/
-      //@ts-ignore
-      React.createElement(IconFont, {
-        style: {
-          fontSize: 20
-        },
-        type: VENUS_ConflictFlag_Image_Url[v.iconPath] || "null"
-      })) : null)];
-    }));
-  }
+      ,
+      type: VENUS_ConflictFlag_Image_Url[v.iconPath]
+    })));
+  }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "venus-design",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "venus all compoments",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",