@bit-sun/business-component 4.0.13-alpha.5 → 4.0.13-alpha.6

package/dist/components/Functional/SearchSelect/utils.d.ts

@@ -25,4 +25,5 @@ export declare const convertResData: (requestConfig: any, res: any, selectProps:
 export declare const handleSelectOptionsShowValue: (specialBracket: boolean, noNeedSplit: boolean, item: any) => any;
 export declare const LightHeightOption: (props: any) => React.JSX.Element;
 export declare const maxTagPlaceholder: (selectedValues: any, { selectProps, onChange, value, setIsMaxTagsOpen }: any) => React.JSX.Element;
+export declare const handleTableColumns: (tableColumns: any) => any;
 export declare const getShowStr: ({ viewShowValueStr, labelInValue, selectMode, value, items }: any) => any;

package/dist/index.esm.js

@@ -4465,6 +4465,16 @@ var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref3) {
     })))
   }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
 };
+// 弹窗数据表头处理
+var handleTableColumns = function handleTableColumns(tableColumns) {
+  // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
+  var showTableColumns = (tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter(function (s) {
+    return typeof s.defaultSort == 'number';
+  })) || tableColumns || [];
+  return (showTableColumns === null || showTableColumns === void 0 ? void 0 : showTableColumns.sort(function (a, b) {
+    return a.defaultSort - b.defaultSort;
+  })) || [];
+};
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
 // ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
 var getShowLabelTextStr = function getShowLabelTextStr(_ref4) {
@@ -5223,7 +5233,7 @@ var PropertySelector = function PropertySelector(_ref) {
 
 var Option$1 = Select.Option;
 var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _pathname$match, _modalTableProps$tabl, _modalTableProps$tabl2;
+  var _pathname$match;
   var value = props.value,
     onChangeTemp = props.onChange,
     _props$selectProps = props.selectProps,
@@ -5446,14 +5456,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState40 = _slicedToArray(_useState39, 2),
     tooltipVisible = _useState40[0],
     setTooltipVisible = _useState40[1];
-  var _useState41 = useState((modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableColumns) === null || _modalTableProps$tabl === void 0 ? void 0 : (_modalTableProps$tabl2 = _modalTableProps$tabl.filter(function (s) {
-      return typeof s.defaultSort == 'number';
-    })) === null || _modalTableProps$tabl2 === void 0 ? void 0 : _modalTableProps$tabl2.sort(function (a, b) {
-      return a.defaultSort - b.defaultSort;
-    })) || []),
+  var _useState41 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState42 = _slicedToArray(_useState41, 2),
     tableShowColumns = _useState42[0],
-    setTabletShowColumns = _useState42[1];
+    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
   var _useState43 = useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
     confirmLoading = _useState44[0],
@@ -5655,6 +5661,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [value]);
   useEffect(function () {
     setUniqueValue(makeUniqueValue());
+    setTabletShowColumns(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns));
   }, [resultSourceKey]);
   useEffect(function () {
     if (init) {

package/dist/index.js

@@ -4488,6 +4488,16 @@ var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref3) {
     })))
   }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
 };
+// 弹窗数据表头处理
+var handleTableColumns = function handleTableColumns(tableColumns) {
+  // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
+  var showTableColumns = (tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter(function (s) {
+    return typeof s.defaultSort == 'number';
+  })) || tableColumns || [];
+  return (showTableColumns === null || showTableColumns === void 0 ? void 0 : showTableColumns.sort(function (a, b) {
+    return a.defaultSort - b.defaultSort;
+  })) || [];
+};
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------
 // ------------------------------------------ 选中数据展示 相关处理--开始----------------------------------------
 var getShowLabelTextStr = function getShowLabelTextStr(_ref4) {
@@ -5246,7 +5256,7 @@ var PropertySelector = function PropertySelector(_ref) {
 
 var Option$1 = antd.Select.Option;
 var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
-  var _pathname$match, _modalTableProps$tabl, _modalTableProps$tabl2;
+  var _pathname$match;
   var value = props.value,
     onChangeTemp = props.onChange,
     _props$selectProps = props.selectProps,
@@ -5469,14 +5479,10 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     _useState40 = _slicedToArray(_useState39, 2),
     tooltipVisible = _useState40[0],
     setTooltipVisible = _useState40[1];
-  var _useState41 = React$1.useState((modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableColumns) === null || _modalTableProps$tabl === void 0 ? void 0 : (_modalTableProps$tabl2 = _modalTableProps$tabl.filter(function (s) {
-      return typeof s.defaultSort == 'number';
-    })) === null || _modalTableProps$tabl2 === void 0 ? void 0 : _modalTableProps$tabl2.sort(function (a, b) {
-      return a.defaultSort - b.defaultSort;
-    })) || []),
+  var _useState41 = React$1.useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState42 = _slicedToArray(_useState41, 2),
     tableShowColumns = _useState42[0],
-    setTabletShowColumns = _useState42[1];
+    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
   var _useState43 = React$1.useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
     confirmLoading = _useState44[0],
@@ -5678,6 +5684,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   }, [value]);
   React$1.useEffect(function () {
     setUniqueValue(makeUniqueValue());
+    setTabletShowColumns(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns));
   }, [resultSourceKey]);
   React$1.useEffect(function () {
     if (init) {

package/package.json

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

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

@@ -7,7 +7,7 @@ import request from '@/utils/request';
 import _, { escapeRegExp, isNil, values } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput, QueryMutipleSearchSelect } from '@/index';
-import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder, getShowStr }  from './utils';
+import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder, getShowStr, handleTableColumns }  from './utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
 import PropertySelector from '@/components/Business/PropertyModal';
@@ -140,7 +140,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const [indeterminate, setIndeterminate] = useState(false)
   const [tableFormParams, setTableFormParams] = useState({});
   const [tooltipVisible, setTooltipVisible] = useState(false);
-  const [tableShowColumns, setTabletShowColumns] = useState(modalTableProps?.tableColumns?.filter(s => typeof s.defaultSort == 'number')?.sort((a,b)=> a.defaultSort-b.defaultSort)||[]);
+  const [tableShowColumns, setTabletShowColumns] = useState(handleTableColumns(modalTableProps?.tableColumns)); // 默认展示表头-modalTableProps?.tableColumns
   const [confirmLoading, setConfirmLoading] = useState(false);
   const [modalSearched, setModalSearched]=useState(false);
 
@@ -322,6 +322,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   useEffect(() => {
     setUniqueValue(makeUniqueValue());
+    setTabletShowColumns(handleTableColumns(modalTableProps?.tableColumns));
   }, [resultSourceKey])
 
   useEffect(() => {

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

@@ -397,6 +397,13 @@ export const maxTagPlaceholder = (selectedValues: any, { selectProps, onChange,
   )
 }
 
+// 弹窗数据表头处理
+export const handleTableColumns = (tableColumns: any) => {
+  // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
+  const showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number')||tableColumns||[];
+  return showTableColumns?.sort((a: any,b: any)=> a.defaultSort-b.defaultSort)||[]
+};
+
 // ------------------------------------------ 数据源展示 相关处理--结束----------------------------------------