@bit-sun/business-component 2.1.1-alpha.19 → 2.1.1-alpha.20

package/dist/index.esm.js

@@ -15974,8 +15974,6 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
         }),
         summary: showSummary
       });
-      console.log('重新加载');
-      console.log("\uD83D\uDE80 => render => showCol", showCol);
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
         style: {
           overflow: 'hidden',
@@ -16239,6 +16237,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
       };
 
       var showCol = this.state.showColumns.map(function (item) {
+        handleColumnsSpecialParams(item);
         return _objectSpread2({}, item);
       });
       handleColumns(showCol, []);
@@ -18005,10 +18004,6 @@ var index$5 = (function (props) {
       JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialTableInfo();
     }
   }, [props === null || props === void 0 ? void 0 : props.columns]);
-  useEffect(function () {
-    setInitialTableInfo();
-    console.log('columns 重新加载');
-  }, [props === null || props === void 0 ? void 0 : props.refreshParams]);
   var watchWinResize = debounce(function () {
     getTableHeight();
 

package/dist/index.js

@@ -15988,8 +15988,6 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
         }),
         summary: showSummary
       });
-      console.log('重新加载');
-      console.log("\uD83D\uDE80 => render => showCol", showCol);
       return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
           overflow: 'hidden',
@@ -16253,6 +16251,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
       };
 
       var showCol = this.state.showColumns.map(function (item) {
+        handleColumnsSpecialParams(item);
         return _objectSpread2({}, item);
       });
       handleColumns(showCol, []);
@@ -18019,10 +18018,6 @@ var index$5 = (function (props) {
       JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialTableInfo();
     }
   }, [props === null || props === void 0 ? void 0 : props.columns]);
-  React.useEffect(function () {
-    setInitialTableInfo();
-    console.log('columns 重新加载');
-  }, [props === null || props === void 0 ? void 0 : props.refreshParams]);
   var watchWinResize = _.debounce(function () {
     getTableHeight();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.1.1-alpha.19",
+  "version": "2.1.1-alpha.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -16,7 +16,7 @@ import scanning from '../../../assets/scanning.svg';
 import { debounce } from 'lodash';
 import ExportIcon from '@/components/Functional/ExportFunctions/ExportIcon';
 import ENUM from '@/utils/enumConfig';
-import { handleColumnsSpecialParams } from '@/utils/utils';
+import { handleBssulaColumnsSpecialParams } from '@/utils/utils';
 
 const MemoQueryTable = React.memo(QueryTable);
 
@@ -132,7 +132,7 @@ export default (props: any) => {
             }
           });
         }
-        handleColumnsSpecialParams(d);
+        handleBssulaColumnsSpecialParams(d);
       });
       setCommonRenderFn(props.columns);
       const authButton = localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES)

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

@@ -5,7 +5,7 @@ import ColumnSetting from './columnSetting';
 import { getItemDefaultWidth, handleTextOverflow } from './utils';
 import { noEmptyArray } from './utils';
 import ENUM from '@/utils/enumConfig';
-import { handleColumnsSpecialParams } from '@/utils/utils';
+import { handleAntdColumnsSpecialParams } from '@/utils/utils';
 const { Text } = Typography;
 export default class ColumnSettingTable extends React.Component {
   state: any;
@@ -118,7 +118,7 @@ export default class ColumnSettingTable extends React.Component {
           ...arr[i],
           width: size.width,
         };
-        handleColumnsSpecialParams(arr[i]);
+        handleAntdColumnsSpecialParams(arr[i]);
       }
     };
     handleIndex(newColumns, [...index]);
@@ -186,7 +186,7 @@ export default class ColumnSettingTable extends React.Component {
       })
     };
     let showCol = this.state.showColumns.map((item: any) => {
-      handleColumnsSpecialParams(item);
+      handleAntdColumnsSpecialParams(item);
       return ({ ...item })
     })
     handleColumns(showCol, []);

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -9,7 +9,7 @@ import {
   Typography,
 } from 'antd';
 import ENUM from '@/utils/enumConfig';
-import { handleColumnsSpecialParams } from '@/utils/utils';
+import { handleBssulaColumnsSpecialParams } from '@/utils/utils';
 const { Text } = Typography;
 export default class ColumnSettingSulaTable extends React.Component {
   sulaTableRef: React.RefObject<unknown>;
@@ -124,7 +124,7 @@ export default class ColumnSettingSulaTable extends React.Component {
           ...arr[i],
           width: size.width,
         };
-        handleColumnsSpecialParams(arr[i]);
+        handleBssulaColumnsSpecialParams(arr[i]);
       }
     };
     handleIndex(newColumns, [...index]);
@@ -192,7 +192,7 @@ export default class ColumnSettingSulaTable extends React.Component {
       })
     };
     let showCol = this.state.showColumns.map((item: any) => {
-      handleColumnsSpecialParams(item);
+      handleBssulaColumnsSpecialParams(item);
       return ({ ...item })
     })
     handleColumns(showCol, []);

package/src/utils/utils.ts

@@ -66,10 +66,10 @@ export const go2BackAndClose = () => {
 }
 
 /**
- * 处理Table的公共回显样式
+ * 处理bssulaTable的公共回显样式
  * @param col 每一具体行
  */
-export const handleColumnsSpecialParams = (col: any) => {
+export const handleBssulaColumnsSpecialParams = (col: any) => {
   if (col.timeRenderHour) {
     col.render = ({ text }: any) =>
       handleTooltipHours(text, col.timeRenderHour);
@@ -102,4 +102,42 @@ export const handleColumnsSpecialParams = (col: any) => {
     // col.render = ({ text }: any) => text || '- -';
     col.render = ({ text }: any) => text || '-/-';
   }
+};
+/**
+ * 处理antdTable的公共回显样式
+ * @param col 每一具体行
+ */
+ export const handleAntdColumnsSpecialParams = (col: any) => {
+  if (col.timeRenderHour) {
+    col.render = (text: any) =>
+      handleTooltipHours(text, col.timeRenderHour);
+  }
+  // 处理不显示 时分秒的时间
+  if (col.timeRender) {
+    col.render = (text: any) => handleTooltip(text, col.timeRender);
+  }
+  // 处理文字太长
+  if (col.textOverflow) {
+    col.render = (text: any) => handleTextOverflow(text);
+  }
+  if (col.images) {
+    col.render = (text: any) => tableColumnsImage(text);
+  }
+  if (col.double) {
+    col.render = (_: any, record: any) =>
+      handleTextDouble(record[col.textOne], record[col.textTwo]);
+  }
+  if (col.lineFeed) {
+    col.render = (text: any) => handleTextLineFeed(text);
+  }
+
+  // 处理序号
+  if (col.indexNumber) {
+    col.render = (_: any, __: any, index: any) => index + 1;
+  }
+  // 没有值默认显示 - -
+  if (!col.render) {
+    // col.render = ({ text }: any) => text || '- -';
+    col.render = (text: any) => text || '-/-';
+  }
 }