@arim-aisdc/public-components 2.3.9 → 2.3.12

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/CustomForm/RemoteSelectCom/index.js

@@ -51,7 +51,7 @@ var RemoteSelect = function RemoteSelect(_ref) {
   return /*#__PURE__*/_jsx(Select, {
     className: "customForm-remoteSelect",
     mode: item.mode ? item.mode : undefined,
-    showSearch: item.showSearch,
+    showSearch: !!item.showSearch,
     placeholder: item.inputTips,
     allowClear: item.allowClear,
     value: value,

package/dist/components/CustomForm/type.d.ts

@@ -86,7 +86,7 @@ export type CustomSearchFieldType = {
     max?: number;
     step?: number;
     precision?: number;
-    showSearch?: boolean;
+    showSearch?: boolean | Object;
     handleSearch?: () => void;
     suffix?: string;
     isFilter?: boolean;

package/dist/components/QueryFilter/RemoteSelectCom/index.js

@@ -51,7 +51,7 @@ var RemoteSelect = function RemoteSelect(_ref) {
   return /*#__PURE__*/_jsx(Select, {
     className: "queryFilter-remoteSelect",
     mode: item.mode ? item.mode : undefined,
-    showSearch: item.showSearch,
+    showSearch: !!item.showSearch,
     placeholder: item.inputTips,
     allowClear: item.allowClear,
     value: value,

package/dist/components/QueryFilter/type.d.ts

@@ -102,7 +102,7 @@ export type searchFieldType = {
     /**imputnumber 步长 */
     step?: number;
     /**是否远程搜索 autocomplete 不需要，select需要 */
-    showSearch?: boolean;
+    showSearch?: boolean | Object;
     /**自定义节点 label、value、options、groupLabel 的字段 */
     fieldNames?: {
         label?: string;

package/dist/components/TableMax/TableHeader/index.less

@@ -59,7 +59,7 @@ table {
 
   .cell-right {
     display: flex;
-    gap: 4px;
+    // gap: 4px;
     align-items: center;
   }
 
@@ -105,7 +105,7 @@ table {
 
   &:hover {
     .sort-flag {
-      display: inline-block;
+      display: flex;
     }
     .filter-icon {
       display: inline-block;

package/dist/components/TableMax/TableMax.js

@@ -845,23 +845,24 @@ var TableMax = function TableMax(_ref) {
   // 是否可点击编辑按钮:当且仅当选中一行时可点击编辑按钮
   var canClickEditIcon = useMemo(function () {
     var rowObjs = table.getSelectedRowModel().rows;
-    return !!rowSelectedId || rowObjs.length === 1;
+    return !!rowSelectedId || rowObjs.length > 0;
   }, [rowSelectedId, rowSelection]);
 
   // 点击【编辑】图标
   var editFun = function editFun() {
-    var _selectedTableRows$, _tableRows$find, _selectedTableRows$2;
+    var _selectedTableRows, _tableRows$find, _selectedTableRows2;
     if (!canClickEditIcon) return;
     var selectedTableRows = table.getSelectedRowModel().rows;
+    var selectedTableRowsLength = selectedTableRows.length;
     var _table$getRowModel2 = table.getRowModel(),
       tableRows = _table$getRowModel2.rows;
     var selectRow =
     // eslint-disable-next-line eqeqeq
-    (canSelection ? (_selectedTableRows$ = selectedTableRows[0]) === null || _selectedTableRows$ === void 0 ? void 0 : _selectedTableRows$.original : (_tableRows$find = tableRows.find(function (item) {
+    (canSelection ? (_selectedTableRows = selectedTableRows[selectedTableRowsLength - 1]) === null || _selectedTableRows === void 0 ? void 0 : _selectedTableRows.original : (_tableRows$find = tableRows.find(function (item) {
       return item.id == rowSelectedId;
     })) === null || _tableRows$find === void 0 ? void 0 : _tableRows$find.original) || {};
     setFormData(selectRow);
-    setEditingRowId((canSelection ? (_selectedTableRows$2 = selectedTableRows[0]) === null || _selectedTableRows$2 === void 0 ? void 0 : _selectedTableRows$2.id : rowSelectedId) || '');
+    setEditingRowId((canSelection ? (_selectedTableRows2 = selectedTableRows[selectedTableRowsLength - 1]) === null || _selectedTableRows2 === void 0 ? void 0 : _selectedTableRows2.id : rowSelectedId) || '');
   };
 
   // 点击【取消编辑】按钮

package/dist/components/TableMax/components/ColumnFilterV2/Filter.js

@@ -8,6 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useTranslation } from "../../../../hooks/useTranslation";
 import { AutoComplete, DatePicker, Input, InputNumber } from 'antd';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash';
@@ -17,7 +18,6 @@ import { DateRange } from "./DateRange";
 import MultipleSelect from "./MultipleSelect";
 import NumberRange from "./NumberRange";
 import SingleSelect from "./SingleSelect";
-import { useTranslation } from "../../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";
 var Filter = function Filter(_ref) {
   var column = _ref.column,
@@ -27,7 +27,9 @@ var Filter = function Filter(_ref) {
   // 筛选组件类型
   var filterType = columnDef.filterType,
     filterOptions = columnDef.filterOptions,
-    getFilterOptionsFn = columnDef.getFilterOptionsFn;
+    getFilterOptionsFn = columnDef.getFilterOptionsFn,
+    _columnDef$isFilterOp = columnDef.isFilterOptionsFrontSearch,
+    isFilterOptionsFrontSearch = _columnDef$isFilterOp === void 0 ? false : _columnDef$isFilterOp;
 
   // 获取最新的筛选值
   var _useState = useState(column.getFilterValue()),
@@ -254,7 +256,7 @@ var Filter = function Filter(_ref) {
           onChange: handleChangeFilterValue,
           onSearch: onSearch,
           options: options,
-          isRemoteSearch: !!getFilterOptionsFn,
+          isFrontSearch: isFilterOptionsFrontSearch,
           onCloseFilterPanel: onCloseFilterPanel,
           loading: apiLoading
         });
@@ -266,7 +268,7 @@ var Filter = function Filter(_ref) {
           onSearch: onSearch,
           options: options,
           loading: apiLoading,
-          isRemoteSearch: !!getFilterOptionsFn,
+          isFrontSearch: isFilterOptionsFrontSearch,
           onCloseFilterPanel: onCloseFilterPanel
         });
     }

package/dist/components/TableMax/components/ColumnFilterV2/MultipleSelect/index.d.ts

@@ -4,9 +4,9 @@ interface IProps {
     options: any[];
     onChange: (value: any[]) => void;
     onSearch: (value: string) => void;
-    isRemoteSearch: boolean;
+    isFrontSearch: boolean;
     loading: boolean;
     onCloseFilterPanel: () => void;
 }
-declare const MultipleSelect: ({ value, onChange, options, onSearch, isRemoteSearch, loading, onCloseFilterPanel, }: IProps) => import("react/jsx-runtime").JSX.Element;
+declare const MultipleSelect: ({ value, onChange, options, onSearch, isFrontSearch, loading, onCloseFilterPanel, }: IProps) => import("react/jsx-runtime").JSX.Element;
 export default MultipleSelect;

package/dist/components/TableMax/components/ColumnFilterV2/MultipleSelect/index.js

@@ -4,11 +4,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useTranslation } from "../../../../../hooks/useTranslation";
 import { useUpdateEffect } from 'ahooks';
 import { Button, Checkbox, Input, Spin } from 'antd';
 import { useMemo, useState } from 'react';
 import "./index.less";
-import { useTranslation } from "../../../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -19,7 +19,7 @@ var MultipleSelect = function MultipleSelect(_ref) {
     onChange = _ref.onChange,
     options = _ref.options,
     onSearch = _ref.onSearch,
-    isRemoteSearch = _ref.isRemoteSearch,
+    isFrontSearch = _ref.isFrontSearch,
     loading = _ref.loading,
     onCloseFilterPanel = _ref.onCloseFilterPanel;
   // 内部state
@@ -67,7 +67,7 @@ var MultipleSelect = function MultipleSelect(_ref) {
   };
   var handleInputChange = function handleInputChange(e) {
     var value = e.target.value;
-    if (isRemoteSearch) {
+    if (!isFrontSearch) {
       onSearch(value);
     } else {
       setFrontendSearchValue(value);
@@ -76,7 +76,7 @@ var MultipleSelect = function MultipleSelect(_ref) {
 
   // 最终的可选值
   var finalOptions = useMemo(function () {
-    if (isRemoteSearch) {
+    if (!isFrontSearch) {
       return options;
     }
     var input = (frontendSearchValue !== null && frontendSearchValue !== void 0 ? frontendSearchValue : '').toUpperCase().trim();
@@ -89,13 +89,13 @@ var MultipleSelect = function MultipleSelect(_ref) {
   return /*#__PURE__*/_jsxs("div", {
     className: "tableMax-filter-multipleSelect",
     children: [/*#__PURE__*/_jsx("div", {
-      className: "header",
+      className: "tableMax-filter-multipleSelect-header",
       children: /*#__PURE__*/_jsx(Input, {
         placeholder: t('global.placeholder.input'),
         onChange: handleInputChange
       })
     }), /*#__PURE__*/_jsx("div", {
-      className: "body",
+      className: "tableMax-filter-multipleSelect-body",
       children: loading ? /*#__PURE__*/_jsx("div", {
         className: "loading",
         children: /*#__PURE__*/_jsx(Spin, {})
@@ -112,7 +112,7 @@ var MultipleSelect = function MultipleSelect(_ref) {
         })]
       })
     }), /*#__PURE__*/_jsxs("div", {
-      className: "footer",
+      className: "tableMax-filter-multipleSelect-footer",
       children: [/*#__PURE__*/_jsx(Button, {
         type: "text",
         onClick: handleReset,

package/dist/components/TableMax/components/ColumnFilterV2/MultipleSelect/index.less

@@ -1,10 +1,10 @@
 .tableMax-filter-multipleSelect {
   width: 212px;
-  .header {
+  .tableMax-filter-multipleSelect-header {
     border-bottom: 1px solid @tableColor7;
     padding: 8px 12px;
   }
-  .body {
+  .tableMax-filter-multipleSelect-body {
     height: 220px;
     overflow-y: auto;
     padding: 4px 12px;
@@ -23,7 +23,7 @@
       }
     }
   }
-  .footer {
+  .tableMax-filter-multipleSelect-footer {
     border-top: 1px solid @tableColor7;
     padding: 8px 12px;
     display: flex;

package/dist/components/TableMax/components/ColumnFilterV2/SingleSelect/index.d.ts

@@ -4,9 +4,9 @@ interface IProps {
     options: any[];
     onChange: (value: string | number | undefined) => void;
     onSearch: (value: string) => void;
-    isRemoteSearch: boolean;
+    isFrontSearch: boolean;
     loading: boolean;
     onCloseFilterPanel: () => void;
 }
-declare const SingleSelect: ({ value, onChange, options, onSearch, isRemoteSearch, loading, onCloseFilterPanel, }: IProps) => import("react/jsx-runtime").JSX.Element;
+declare const SingleSelect: ({ value, onChange, options, onSearch, isFrontSearch, loading, onCloseFilterPanel, }: IProps) => import("react/jsx-runtime").JSX.Element;
 export default SingleSelect;

package/dist/components/TableMax/components/ColumnFilterV2/SingleSelect/index.js

@@ -4,11 +4,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useTranslation } from "../../../../../hooks/useTranslation";
 import { useUpdateEffect } from 'ahooks';
 import { Button, Input, Spin } from 'antd';
 import { useMemo, useState } from 'react';
 import "./index.less";
-import { useTranslation } from "../../../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var SingleSelect = function SingleSelect(_ref) {
@@ -17,7 +17,7 @@ var SingleSelect = function SingleSelect(_ref) {
     onChange = _ref.onChange,
     options = _ref.options,
     onSearch = _ref.onSearch,
-    isRemoteSearch = _ref.isRemoteSearch,
+    isFrontSearch = _ref.isFrontSearch,
     loading = _ref.loading,
     onCloseFilterPanel = _ref.onCloseFilterPanel;
   // 内部state
@@ -52,7 +52,7 @@ var SingleSelect = function SingleSelect(_ref) {
   }, [value]);
   var handleInputChange = function handleInputChange(e) {
     var value = e.target.value;
-    if (isRemoteSearch) {
+    if (!isFrontSearch) {
       onSearch(value);
     } else {
       setFrontendSearchValue(value);
@@ -61,7 +61,7 @@ var SingleSelect = function SingleSelect(_ref) {
 
   // 最终的可选值
   var finalOptions = useMemo(function () {
-    if (isRemoteSearch) {
+    if (!isFrontSearch) {
       return options;
     }
     var input = (frontendSearchValue !== null && frontendSearchValue !== void 0 ? frontendSearchValue : '').toUpperCase().trim();
@@ -74,13 +74,13 @@ var SingleSelect = function SingleSelect(_ref) {
   return /*#__PURE__*/_jsxs("div", {
     className: "tableMax-filter-singleSelect",
     children: [/*#__PURE__*/_jsx("div", {
-      className: "header",
+      className: "tableMax-filter-singleSelect-header",
       children: /*#__PURE__*/_jsx(Input, {
         placeholder: t('global.placeholder.input'),
         onChange: handleInputChange
       })
     }), /*#__PURE__*/_jsx("div", {
-      className: "body",
+      className: "tableMax-filter-singleSelect-body",
       children: loading ? /*#__PURE__*/_jsx("div", {
         className: "loading",
         children: /*#__PURE__*/_jsx(Spin, {})
@@ -95,7 +95,7 @@ var SingleSelect = function SingleSelect(_ref) {
         }, option.value);
       })
     }), /*#__PURE__*/_jsxs("div", {
-      className: "footer",
+      className: "tableMax-filter-singleSelect-footer",
       children: [/*#__PURE__*/_jsx(Button, {
         type: "text",
         onClick: handleReset,

package/dist/components/TableMax/components/ColumnFilterV2/SingleSelect/index.less

@@ -1,11 +1,11 @@
 .tableMax-filter-singleSelect {
   box-sizing: border-box;
   width: 212px;
-  .header {
+  .tableMax-filter-singleSelect-header {
     border-bottom: 1px solid @tableColor7;
     padding: 8px 12px;
   }
-  .body {
+  .tableMax-filter-singleSelect-body {
     height: 220px;
     overflow-y: auto;
     padding: 4px 12px;
@@ -34,7 +34,7 @@
       background-color: @tableColor8;
     }
   }
-  .footer {
+  .tableMax-filter-singleSelect-footer {
     border-top: 1px solid @tableColor7;
     padding: 8px 12px;
     display: flex;

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/components/ColumnSort/index.less

@@ -1,9 +1,9 @@
 .sort-flag {
-  display: flex;
   justify-content: center;
   align-items: center;
   flex-direction: column;
   width: 16px;
+  height: 16px;
   cursor: pointer;
   display: none;
 
@@ -13,7 +13,7 @@
     height: 0;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
-    border-bottom: 6px solid #b4b6bfff;
+    border-bottom: 6px solid #fff;
 
     &-red {
       border-bottom: 6px solid #fa541cff;
@@ -27,7 +27,7 @@
     margin-top: 3px;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
-    border-top: 6px solid #b4b6bfff;
+    border-top: 6px solid #fff;
 
     &-red {
       border-top: 6px solid #fa541cff;
@@ -36,5 +36,5 @@
 }
 
 .show-sort-flag {
-  display: inline-block !important;
+  display: flex !important;
 }

package/dist/components/TableMax/type.d.ts

@@ -340,6 +340,8 @@ export interface TableMaxColumnType {
     }[];
     /**通过该函数获取可选项 */
     getFilterOptionsFn?: IGetOptionType;
+    /** 表头筛选组件SingleSelect/MultiSelect中，输入字符串时对可选项进行过滤，是否前端过滤，默认false */
+    isFilterOptionsFrontSearch?: boolean;
     /**列筛选时 使用的过滤函数 */
     filterFn?: FilterFnType | ((row: any, columnId: any, filterValue: any) => boolean);
     /**筛选组件属性配置 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.9",
+  "version": "2.3.12",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",