@bit-sun/business-component 4.0.13-alpha.12 → 4.0.13-alpha.14

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import request$1 from 'umi-request';
 import cookie from 'js-cookie';
-import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, ConfigProvider, Tag, Select, Spin, Form, Table, Row, Col, Tabs, TreeSelect, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Result, Affix, Cascader, DatePicker, TimePicker, Divider, Switch, Collapse } from 'antd';
+import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, ConfigProvider, Tag, Select, Spin, Form, Table, Empty, Row, Col, Tabs, TreeSelect, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Result, Affix, Cascader, DatePicker, TimePicker, Divider, Switch, Collapse } from 'antd';
 import _, { omit, uniqBy, escapeRegExp, isNil, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl, request as request$3 } from 'umi';
@@ -6060,9 +6060,20 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
     return collapsed ? formItem(list === null || list === void 0 ? void 0 : list.slice(0, viCount)) : formItem(list);
   };
+  var renderEmptyText = function renderEmptyText(text, x) {
+    return /*#__PURE__*/React$1.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE,
+      description: text,
+      style: {
+        margin: "".concat(x, " 0px")
+      }
+    });
+  };
   var renderShowTable = function renderShowTable(tableList, type) {
     var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
-    var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - 82px)"); // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28; // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
+    var mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
     return /*#__PURE__*/React$1.createElement("div", {
       style: {
         height: "calc(100vh - ".concat(tableBoxHeighth, "px)")
@@ -6078,14 +6089,14 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         showSizeChanger: false
       }),
       locale: {
-        emptyText: '暂无已选结果'
+        emptyText: renderEmptyText('暂无已选结果', mTB)
       }
     } : {
       pagination: tablePagination,
       onChange: handleTableChange,
       loading: fetching,
       locale: {
-        emptyText: modalSearched ? '无匹配结果,请更换其他内容再试' : '请输入搜索条件'
+        emptyText: modalSearched ? renderEmptyText('匹配结果,请更换其他内容再试', mTB) : renderEmptyText('请输入搜索条件', mTB)
       }
     }), {}, {
       rowKey: mappingValueField,
@@ -17915,7 +17926,7 @@ var BsSulaQueryTable = (function (props) {
             }
           });
         }
-        handleBssulaColumnsSpecialParams(d);
+        // handleBssulaColumnsSpecialParams(d);
       });
       setCommonRenderFn(props.columns);
       var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
@@ -17945,7 +17956,7 @@ var BsSulaQueryTable = (function (props) {
     var showColumns = getSettingFieldOrColumn(isReset ? [] : columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
@@ -17958,7 +17969,7 @@ var BsSulaQueryTable = (function (props) {
     var showExportColumns = getSettingFieldOrColumn(exportColumnConfig, columns, 'columns');
     showExportColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
@@ -18185,9 +18196,9 @@ var BsSulaQueryTable = (function (props) {
         newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
           width: size.width
         });
-        newColumns.forEach(function (d) {
-          handleBssulaColumnsSpecialParams(d);
-        });
+        // newColumns.forEach((d: any) => {
+        //   handleBssulaColumnsSpecialParams(d);
+        // });
         return _toConsumableArray(newColumns);
       });
     };

package/dist/index.js

@@ -6083,9 +6083,20 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
     return collapsed ? formItem(list === null || list === void 0 ? void 0 : list.slice(0, viCount)) : formItem(list);
   };
+  var renderEmptyText = function renderEmptyText(text, x) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Empty, {
+      image: antd.Empty.PRESENTED_IMAGE_SIMPLE,
+      description: text,
+      style: {
+        margin: "".concat(x, " 0px")
+      }
+    });
+  };
   var renderShowTable = function renderShowTable(tableList, type) {
     var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
-    var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - 82px)"); // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28; // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
+    var mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         height: "calc(100vh - ".concat(tableBoxHeighth, "px)")
@@ -6101,14 +6112,14 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
         showSizeChanger: false
       }),
       locale: {
-        emptyText: '暂无已选结果'
+        emptyText: renderEmptyText('暂无已选结果', mTB)
       }
     } : {
       pagination: tablePagination,
       onChange: handleTableChange,
       loading: fetching,
       locale: {
-        emptyText: modalSearched ? '无匹配结果,请更换其他内容再试' : '请输入搜索条件'
+        emptyText: modalSearched ? renderEmptyText('匹配结果,请更换其他内容再试', mTB) : renderEmptyText('请输入搜索条件', mTB)
       }
     }), {}, {
       rowKey: mappingValueField,
@@ -17938,7 +17949,7 @@ var BsSulaQueryTable = (function (props) {
             }
           });
         }
-        handleBssulaColumnsSpecialParams(d);
+        // handleBssulaColumnsSpecialParams(d);
       });
       setCommonRenderFn(props.columns);
       var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
@@ -17968,7 +17979,7 @@ var BsSulaQueryTable = (function (props) {
     var showColumns = getSettingFieldOrColumn(isReset ? [] : columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
@@ -17981,7 +17992,7 @@ var BsSulaQueryTable = (function (props) {
     var showExportColumns = getSettingFieldOrColumn(exportColumnConfig, columns, 'columns');
     showExportColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
           width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
@@ -18208,9 +18219,9 @@ var BsSulaQueryTable = (function (props) {
         newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
           width: size.width
         });
-        newColumns.forEach(function (d) {
-          handleBssulaColumnsSpecialParams(d);
-        });
+        // newColumns.forEach((d: any) => {
+        //   handleBssulaColumnsSpecialParams(d);
+        // });
         return _toConsumableArray(newColumns);
       });
     };

package/package.json

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

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

@@ -370,7 +370,7 @@ export default (props: any) => {
             }
           });
         }
-        handleBssulaColumnsSpecialParams(d);
+        // handleBssulaColumnsSpecialParams(d);
       });
       setCommonRenderFn(props.columns);
       const authButton = localStorage.getItem(getMenuAuthDataKey())
@@ -405,7 +405,7 @@ export default (props: any) => {
 
     showColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -429,7 +429,7 @@ export default (props: any) => {
 
     showExportColumns.forEach((item, index) => {
       item.width = item.width || getItemDefaultWidth(item);
-      handleBssulaColumnsSpecialParams(item);
+      // handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
         width:
@@ -715,9 +715,9 @@ export default (props: any) => {
           ...newColumns[index],
           width: size.width,
         };
-        newColumns.forEach((d: any) => {
-          handleBssulaColumnsSpecialParams(d);
-        });
+        // newColumns.forEach((d: any) => {
+        //   handleBssulaColumnsSpecialParams(d);
+        // });
         return [...newColumns];
       });
     };

package/src/components/Functional/SearchSelect/index.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import { useDebounceFn } from 'ahooks';
-import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs } from 'antd';
+import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs, Empty } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
 import request from '@/utils/request';
 import _, { escapeRegExp, isNil, values } from "lodash"
@@ -667,9 +667,15 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     return collapsed ? formItem(list?.slice(0,viCount)) : formItem(list)
   }
 
+  const renderEmptyText = (text: string,x: string) => {
+    return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={text} style={{ margin: `${x} 0px`}} />
+  }
+
   const renderShowTable =  (tableList, type) => {
     const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
-    const oSY = `calc(100vh - ${tableBoxHeighth}px - 82px)`;  // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    const x = tableList?.length ? 82 : 28;  // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
+    const oSY = `calc(100vh - ${tableBoxHeighth}px - ${x}px)`; 
+    const mTB = `calc(50vh - ${tableBoxHeighth/2}px - ${x/2}px - 40px)`
     return (
       <div style={{ height: `calc(100vh - ${tableBoxHeighth}px)` }}> 
         <Table
@@ -681,14 +687,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           {...type=='noPage'?{
             pagination: { ...initPagination,showSizeChanger: false },
             locale: {
-              emptyText: '暂无已选结果',
+              emptyText: renderEmptyText('暂无已选结果',mTB),
             }
           }:{
             pagination: tablePagination,
             onChange: handleTableChange,
             loading: fetching,
             locale: {
-              emptyText: modalSearched? '无匹配结果,请更换其他内容再试' : '请输入搜索条件',
+              emptyText: modalSearched? renderEmptyText('匹配结果,请更换其他内容再试',mTB) : renderEmptyText('请输入搜索条件',mTB),
             }
           }}
           rowKey={mappingValueField}