@bit-sun/business-component 2.1.24 → 2.2.1

package/dist/index.esm.js

@@ -14298,7 +14298,7 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
   if (col.textOverflow) {
     col.render = function (_ref3) {
       var text = _ref3.text;
-      return handleTextOverflow(text);
+      return handleTextOverflow(text, col.width);
     };
   }
   if (col.images) {
@@ -15483,7 +15483,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$ = innerItem[0]) === null || _innerItem$ === void 0 ? void 0 : _innerItem$.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         defaultValue: datasource.map(function (item) {
@@ -15496,7 +15496,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$2 = innerItem[0]) === null || _innerItem$2 === void 0 ? void 0 : _innerItem$2.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         sortDataSource: _toConsumableArray(showColumn)
@@ -15855,7 +15855,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$3 = innerItem[0]) === null || _innerItem$3 === void 0 ? void 0 : _innerItem$3.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         defaultValue: datasource.map(function (item) {
@@ -15868,7 +15868,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$4 = innerItem[0]) === null || _innerItem$4 === void 0 ? void 0 : _innerItem$4.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         sortDataSource: datasource.filter(function (item) {
@@ -16087,7 +16087,9 @@ var BsSulaQueryTable = (function (props) {
     pagePath = _useState2[0],
     setPagePath = _useState2[1];
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  var _useState3 = useState(props.columns.map(function (d) {
+  var _useState3 = useState(props.columns.filter(function (col) {
+      return !col.hidden;
+    }).map(function (d) {
       return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
     })),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -16208,6 +16210,7 @@ var BsSulaQueryTable = (function (props) {
     });
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
+      handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
@@ -16408,6 +16411,9 @@ var BsSulaQueryTable = (function (props) {
         newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
           width: size.width
         });
+        newColumns.forEach(function (d) {
+          handleBssulaColumnsSpecialParams(d);
+        });
         return _toConsumableArray(newColumns);
       });
     };

package/dist/index.js

@@ -14316,7 +14316,7 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
   if (col.textOverflow) {
     col.render = function (_ref3) {
       var text = _ref3.text;
-      return handleTextOverflow(text);
+      return handleTextOverflow(text, col.width);
     };
   }
   if (col.images) {
@@ -15501,7 +15501,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$ = innerItem[0]) === null || _innerItem$ === void 0 ? void 0 : _innerItem$.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         defaultValue: datasource.map(function (item) {
@@ -15514,7 +15514,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$2 = innerItem[0]) === null || _innerItem$2 === void 0 ? void 0 : _innerItem$2.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         sortDataSource: _toConsumableArray(showColumn)
@@ -15873,7 +15873,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$3 = innerItem[0]) === null || _innerItem$3 === void 0 ? void 0 : _innerItem$3.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         defaultValue: datasource.map(function (item) {
@@ -15886,7 +15886,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             key: item.key || item.dataIndex,
             width: ((_innerItem$4 = innerItem[0]) === null || _innerItem$4 === void 0 ? void 0 : _innerItem$4.width) || item.width,
-            hidden: config.length && !innerItem.length
+            hidden: config.length ? !innerItem.length : item.hidden
           });
         }),
         sortDataSource: datasource.filter(function (item) {
@@ -16105,7 +16105,9 @@ var BsSulaQueryTable = (function (props) {
     pagePath = _useState2[0],
     setPagePath = _useState2[1];
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
-  var _useState3 = React.useState(props.columns.map(function (d) {
+  var _useState3 = React.useState(props.columns.filter(function (col) {
+      return !col.hidden;
+    }).map(function (d) {
       return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
     })),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -16226,6 +16228,7 @@ var BsSulaQueryTable = (function (props) {
     });
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
+      handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
@@ -16426,6 +16429,9 @@ var BsSulaQueryTable = (function (props) {
         newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
           width: size.width
         });
+        newColumns.forEach(function (d) {
+          handleBssulaColumnsSpecialParams(d);
+        });
         return _toConsumableArray(newColumns);
       });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.1.24",
+  "version": "2.2.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -43,7 +43,7 @@ export default (props: any) => {
   const [pagePath, setPagePath] = useState('');
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
   const [checkedList, setCheckedList] = useState(
-    props.columns.map((d: any) => Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : (d.key || d.dataIndex)),
+    props.columns.filter((col: any) => !col.hidden).map((d: any) => Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : (d.key || d.dataIndex)),
   );
   const { pathname } = useLocation();
   const [id]: any = useState(
@@ -174,9 +174,10 @@ export default (props: any) => {
         return column.notRegularCheckList || checkedList.indexOf(columnKey) > -1;
       }
     )
-    
+
     showColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
+      handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -416,6 +417,9 @@ export default (props: any) => {
             ...newColumns[index],
             width: size.width,
           };
+          newColumns.forEach((d: any) => {
+            handleBssulaColumnsSpecialParams(d);
+          })
           return [...newColumns];
         });
       };

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -126,7 +126,7 @@ class SortableTable extends React.Component {
           ...item,
           key: item.key || item.dataIndex,
           width: innerItem[0]?.width || item.width,
-          hidden: config.length && !innerItem.length,
+          hidden: config.length ? !innerItem.length : item.hidden,
         };
       }),
       defaultValue: datasource.map((item) => {
@@ -141,7 +141,7 @@ class SortableTable extends React.Component {
           ...item,
           key: item.key || item.dataIndex,
           width: innerItem[0]?.width || item.width,
-          hidden: config.length && !innerItem.length,
+          hidden: config.length ? !innerItem.length : item.hidden,
         };
       }),
       sortDataSource: [...showColumn]
@@ -166,7 +166,7 @@ class SortableTable extends React.Component {
           ...item,
           key: item.key || item.dataIndex,
           width: innerItem[0]?.width || item.width,
-          hidden: config.length && !innerItem.length,
+          hidden: config.length ? !innerItem.length : item.hidden,
         };
       }),
       defaultValue: datasource.map((item) => {
@@ -181,7 +181,7 @@ class SortableTable extends React.Component {
           ...item,
           key: item.key || item.dataIndex,
           width: innerItem[0]?.width || item.width,
-          hidden: config.length && !innerItem.length,
+          hidden: config.length ? !innerItem.length : item.hidden,
         };
       }),
       sortDataSource: datasource

package/src/utils/utils.ts

@@ -80,7 +80,7 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   }
   // 处理文字太长
   if (col.textOverflow) {
-    col.render = ({ text }: any) => handleTextOverflow(text);
+    col.render = ({ text }: any) => handleTextOverflow(text,col.width);
   }
   if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
@@ -180,4 +180,4 @@ export function uuid() {
 
   const uuid = s.join('');
   return uuid;
-}
+}