@arim-aisdc/public-components 2.2.8 → 2.3.0

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

@@ -0,0 +1,23 @@
+.filter-icon {
+  cursor: pointer;
+}
+
+.height-light-filter {
+  color: @global-primary-color;
+}
+
+.filter-panel-wrapper {
+  position: fixed;
+  z-index: 9999;
+  border-radius: 2px;
+  width: fit-content;
+  box-shadow: 0px 5px 12px 4px rgba(3, 6, 33, 0.15);
+  background: @tableSettingModalBgc;
+  // border: 1px solid #d9d9d9;
+  transform: translateX(-100%);
+}
+
+.single-com-wrapper {
+  padding: 8px 12px;
+  border-radius: 2px;
+}

package/dist/components/TableMax/components/ColumnSetting/index.js

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
-import { Checkbox, Segmented, Switch, Tooltip } from 'antd';
+import { Checkbox, Segmented, Tooltip } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
@@ -342,18 +342,9 @@ var ColumnSetting = function ColumnSetting(_ref3) {
       ref: configWrapperRef,
       className: "column-config-wapper",
       style: columnConfigStyle,
-      children: [/*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: "first-row-setting",
-        children: [canFilter ? /*#__PURE__*/_jsxs("div", {
-          className: "column-filtering",
-          children: [/*#__PURE__*/_jsx("span", {
-            children: "\u663E\u793A\u7B5B\u9009"
-          }), /*#__PURE__*/_jsx(Switch, {
-            className: "switch-button",
-            defaultChecked: enableFilters,
-            onChange: onFilterSwitchChange
-          })]
-        }) : null, /*#__PURE__*/_jsxs("div", {
+        children: /*#__PURE__*/_jsxs("div", {
           className: "header-row-num-setting",
           children: [/*#__PURE__*/_jsx("span", {
             children: "\u6807\u9898\u884C\u6570"
@@ -365,7 +356,7 @@ var ColumnSetting = function ColumnSetting(_ref3) {
               marginLeft: 12
             }
           })]
-        })]
+        })
       }), /*#__PURE__*/_jsxs("div", {
         className: "column-setting-wapper",
         children: [/*#__PURE__*/_jsxs("div", {

package/dist/components/TableMax/components/ColumnSort/customSortFns.js

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import { InputType } from "../ColumnEdit";
-import { FilterType } from "../ColumnFilter";
+import { FilterType } from "../ColumnFilterV2";
 var isEmpty = function isEmpty(a) {
   return a === null || a === undefined || a === '';
 };
@@ -40,18 +40,53 @@ export var stringSortFn = function stringSortFn(rowA, rowB, columnId) {
   }
 };
 
+// 定义类型权重：数字为0，布尔为1，字符串为2
+var getTypeWeight = function getTypeWeight(value) {
+  if (typeof value === 'number') return 0; // 数字优先
+  if (typeof value === 'boolean') return 1; // 布尔次之
+  if (typeof value === 'string') return 2; // 字符串最后
+  return Infinity; // 其他类型（如果存在）放到最后
+};
+
 // 数字或字符串排序(按值得类型判断是数字排序还是字符串排序)
 export var numberOrStringSortFn = function numberOrStringSortFn(rowA, rowB, columnId) {
   var aValue = rowA.getValue(columnId);
   var bValue = rowB.getValue(columnId);
   if (!isEmpty(aValue) && !isEmpty(bValue)) {
-    if (typeof aValue === 'number' && typeof bValue === 'number') {
+    // 获取两个值的类型权重
+    var weightA = getTypeWeight(aValue);
+    var weightB = getTypeWeight(bValue);
+    // 如果类型不同，直接比较权重
+    if (weightA !== weightB) {
+      if (weightA > weightB) {
+        return 1;
+      } else {
+        return -1;
+      }
+    }
+    // 如果类型相同，根据具体类型进行值的比较
+    if (typeof aValue === 'number') {
+      // 数字：按数值大小排序
       return aValue > bValue ? 1 : aValue < bValue ? -1 : 0;
+    } else if (typeof aValue === 'boolean') {
+      // 布尔值：false (0) < true (1)
+      return aValue === true && bValue === false ? 1 : aValue === false && bValue === true ? -1 : 0;
+    } else if (typeof aValue === 'string') {
+      // 字符串：按字典序排序
+      // return aValue.localeCompare(bValue);
+      var compare = aValue.localeCompare(bValue);
+      return compare < 0 ? -1 : compare > 0 ? 1 : 0;
     }
-    aValue = aValue + '';
-    bValue = bValue + '';
-    var compare = aValue.localeCompare(bValue);
-    return compare < 0 ? -1 : compare > 0 ? 1 : 0;
+    // 如果是其他类型，保持原顺序
+    return 0;
+
+    // if (typeof aValue === 'number' && typeof bValue === 'number') {
+    //   return aValue > bValue ? 1 : aValue < bValue ? -1 : 0;
+    // }
+    // aValue = aValue + '';
+    // bValue = bValue + '';
+    // const compare = aValue.localeCompare(bValue);
+    // return compare < 0 ? -1 : compare > 0 ? 1 : 0;
   } else if (!isEmpty(aValue) && isEmpty(bValue)) {
     return 1;
   } else if (isEmpty(aValue) && !isEmpty(bValue)) {
@@ -95,9 +130,9 @@ export function setDefaultSortFn(columns) {
       // 解决排序时undefined值的排序问题
       column.sortUndefined = -1;
       if (!column.sortingFn) {
-        if (column.editComType === InputType.InputNumber || column.filterType === FilterType.Integer || column.filterType === FilterType.SingleInteger) {
+        if (column.editComType === InputType.InputNumber || column.filterType === FilterType.Integer || column.filterType === FilterType.NumberRange || column.filterType === FilterType.SingleInteger || column.filterType === FilterType.SingleNumber) {
           column.sortingFn = 'numberSortFn'; // 数字排序
-        } else if (column.editComType === InputType.DatePicker || column.filterType === FilterType.Date || column.filterType === FilterType.SingleDate) {
+        } else if (column.editComType === InputType.DatePicker || column.filterType === FilterType.Date || column.filterType === FilterType.DateRange || column.filterType === FilterType.SingleDate) {
           column.sortingFn = 'timeSortFn'; // 时间排序
         } else {
           column.sortingFn = 'numberOrStringSortFn'; // 默认字符串排序

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

@@ -22,6 +22,13 @@ var Sort = function Sort(_ref) {
       })]
     });
   }
-  return null;
+  return /*#__PURE__*/_jsxs("span", {
+    className: "sort-flag",
+    children: [/*#__PURE__*/_jsx("i", {
+      className: "triangle-up"
+    }), /*#__PURE__*/_jsx("i", {
+      className: "triangle-down"
+    })]
+  });
 };
 export default Sort;

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

@@ -1,8 +1,10 @@
 .sort-flag {
-  display: inline-block;
-  vertical-align: middle;
-  margin-left: 6px;
-  margin-right: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  width: 16px;
+  cursor: pointer;
 
   .triangle-up {
     display: block;

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

@@ -1,8 +1,8 @@
 import TableMax from './TableMax';
 export { ColumnType } from './TableMax';
 export { InputType } from './components/ColumnEdit';
-export { FilterType } from './components/ColumnFilter';
-export type { FilterFnType } from './components/ColumnFilter';
+export { FilterType } from './components/ColumnFilterV2';
+export type { FilterFnType } from './components/ColumnFilterV2';
 export type { SortFnType } from './components/ColumnSort/customSortFns';
 export type { ColumnPinningConfigType, ColumnVisibleConfigType, TableMaxColumnType, TableMaxProps } from './type';
 export default TableMax;

package/dist/components/TableMax/index.js

@@ -1,5 +1,5 @@
 import TableMax from "./TableMax";
 export { ColumnType } from "./TableMax";
 export { InputType } from "./components/ColumnEdit";
-export { FilterType } from "./components/ColumnFilter";
+export { FilterType } from "./components/ColumnFilterV2";
 export default TableMax;

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

@@ -1,8 +1,8 @@
 import { ColumnFiltersState, ColumnResizeMode, RowModel, SortingState } from '@tanstack/react-table';
-import { UploadProps } from 'antd';
+import { TimeRangePickerProps, UploadProps } from 'antd';
 import { Dispatch, ReactNode, SetStateAction } from 'react';
 import { InputType } from './components/ColumnEdit';
-import { FilterFnType, FilterType } from './components/ColumnFilter';
+import { FilterFnType, FilterType } from './components/ColumnFilterV2';
 import { SortFnType } from './components/ColumnSort/customSortFns';
 export type PrefixClsType = 'custom-light' | 'custom-dark';
 export declare enum DropSide {
@@ -208,6 +208,9 @@ export type TableMaxProps = {
         formatFilters: {
             [key: string]: any;
         };
+        formatFiltersV2: {
+            [key: string]: any;
+        };
     }) => void;
     /**自定义表格顶部所有的内容 */
     renderOperate?: ReactNode;
@@ -326,7 +329,7 @@ export interface TableMaxColumnType {
     columns?: TableMaxColumnType[];
     /**列宽度 */
     size?: number;
-    /**单位转换函数，编辑时，会自动调用这个函数处理输入的值 */
+    /**单位转换函数，编辑、筛选时，会自动调用这个函数处理用户输入的值 */
     unitsChangeFn?: (num: number) => number;
     /**列筛选时 筛选组件类型 */
     filterType?: FilterType;
@@ -341,13 +344,14 @@ export interface TableMaxColumnType {
     filterFn?: FilterFnType | ((row: any, columnId: any, filterValue: any) => boolean);
     /**筛选组件属性配置 */
     filterComProps?: {
-        showTime?: boolean;
+        showTime?: any;
         format?: string;
         picker?: 'date' | 'week' | 'month' | 'quarter' | 'year';
+        rangePresets?: TimeRangePickerProps['presets'];
     };
     /**自定义当前列筛选值所使用的key，默认为当前列的id： { [ filterKey || id ]: value} */
     filterKey?: string;
-    /**当前列是否可筛选 */
+    /**当前列是否可筛选，默认true */
     enableColumnFilter?: boolean;
     /**自定义列的类名 */
     columnClassName?: string[];
@@ -383,3 +387,27 @@ export interface TableMaxColumnType {
     /**是否可调整列宽大小 */
     enableResizing?: boolean;
 }
+export type FormatFilterType = {
+    field: string;
+    operator: FilterOperator;
+    value: any;
+};
+export declare enum FilterOperator {
+    Eq = "Eq",// 等于  Field = "Name", Value = "张三"
+    Neq = "Neq",// 不等于  Field = "Age", Value = 18
+    Gt = "Gt",// 大于  Field = "Price", Value = 100
+    Lt = "Lt",// 小于  Field = "Price", Value = 200
+    Ge = "Ge",// 大于等于  Field = "Amount", Value = 1000
+    Le = "Le",// 小于等于  Field = "Amount", Value = 2000
+    Contains = "Contains",// 包含  Field = "Name", Value = "张"
+    NotContains = "NotContains",// 不包含  Field = "Name", Value = "李"
+    StartsWith = "StartsWith",// 开头是  Field = "Code", Value = "A"
+    NotStartsWith = "NotStartsWith",// 开头不是  Field = "Code", Value = "A"
+    EndsWith = "EndsWith",// 结尾是  Field = "Email", Value = "@gmail.com"
+    NotEndsWith = "NotEndsWith",// 结尾不是  Field = "Email", Value = "@gmail.com"
+    In = "In",// 在列表中  Field = "Status", Value = [1, 2, 3]
+    NotIn = "NotIn",// 不在列表中  Field = "Type", Value = ["A", "B"]
+    Between = "Between",// 区间  Field = "Date", Value = [startDate, endDate]
+    IsNull = "IsNull",// 为空  Field = "Remark"
+    IsNotNull = "IsNotNull"
+}

package/dist/components/TableMax/type.js

@@ -14,4 +14,24 @@ export var layoutOptions = [{
 }, {
   key: LayoutType.COMPACT,
   label: '紧凑'
-}];
+}];
+export var FilterOperator = /*#__PURE__*/function (FilterOperator) {
+  FilterOperator["Eq"] = "Eq";
+  FilterOperator["Neq"] = "Neq";
+  FilterOperator["Gt"] = "Gt";
+  FilterOperator["Lt"] = "Lt";
+  FilterOperator["Ge"] = "Ge";
+  FilterOperator["Le"] = "Le";
+  FilterOperator["Contains"] = "Contains";
+  FilterOperator["NotContains"] = "NotContains";
+  FilterOperator["StartsWith"] = "StartsWith";
+  FilterOperator["NotStartsWith"] = "NotStartsWith";
+  FilterOperator["EndsWith"] = "EndsWith";
+  FilterOperator["NotEndsWith"] = "NotEndsWith";
+  FilterOperator["In"] = "In";
+  FilterOperator["NotIn"] = "NotIn";
+  FilterOperator["Between"] = "Between";
+  FilterOperator["IsNull"] = "IsNull";
+  FilterOperator["IsNotNull"] = "IsNotNull";
+  return FilterOperator;
+}({}); // 不为空  Field = "Email"

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

@@ -1,5 +1,6 @@
 import { ColumnFiltersState, SortingState } from '@tanstack/react-table';
-import { TableMaxColumnType } from './type';
+import { FormatFilterType, TableMaxColumnType } from './type';
+export declare const noValue: (value: any) => boolean;
 export declare const getSizeInfo: (columns: TableMaxColumnType[]) => {
     allCount: number;
     hasSizeCount: number;
@@ -18,11 +19,21 @@ export declare const setInitColumnsSize: (tableColumns: any, columnsMap: any, de
     tableColumns: any;
 };
 export declare const getFormatFilters: (columns: TableMaxColumnType[], originFilters: ColumnFiltersState) => {};
+/**
+ * 不同filterType组件的查询格式：
+ * 1. DateRange/NumberRange：
+ *  1.1 只输入开始：Ge
+ *  1.2 只输入结束：Le
+ *  1.3 都输入：Between
+ * 2. MultiSelect没有填filterType：In
+ * 3. Input/AutoComplete：Contains
+ * 4. SingleDate/SingleNumber/SingleSelect：Eq
+ */
+export declare const getFormatFiltersV2: (columns: TableMaxColumnType[], originFilters: ColumnFiltersState) => FormatFilterType[];
 export declare const getFormatSorting: (columns: TableMaxColumnType[], originSorting: SortingState) => {
     id: string;
     desc: boolean;
 }[];
-export declare const noValue: (value: any) => boolean;
 export declare const operationColumnNoTooltips: (columns: TableMaxColumnType[]) => TableMaxColumnType[];
 export declare const downloadExcel: ({ url, data, title, setDownLoading, method, request, }: {
     url: string;

package/dist/components/TableMax/utils.js

@@ -7,7 +7,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { cloneDeep } from 'lodash';
 // import request from '../../utils/request';
-import { FilterType, defaultDateFormat } from "./components/ColumnFilter";
+import { FilterType, defaultDateFormat } from "./components/ColumnFilterV2";
+import { FilterOperator } from "./type";
+export var noValue = function noValue(value) {
+  return value === undefined || value === null || value === '';
+};
 export var getSizeInfo = function getSizeInfo(columns) {
   // let columns = cloneDeep(columnDatas)
   var hasSizeCount = 0; //size有值的列
@@ -54,10 +58,10 @@ export var setRemainColumnsWidth = function setRemainColumnsWidth(initColumns, d
   var fn = function fn(columns) {
     columns.forEach(function (column) {
       var _ref, _column$size2;
-      console.log(column.size, (_ref = (_column$size2 = column.size) !== null && _column$size2 !== void 0 ? _column$size2 : defaultSize) !== null && _ref !== void 0 ? _ref : (column === null || column === void 0 ? void 0 : column.filterType) === FilterType.Date ? 160 : getTextWidth(column.header, 14) + 50);
+      console.log(column.size, (_ref = (_column$size2 = column.size) !== null && _column$size2 !== void 0 ? _column$size2 : defaultSize) !== null && _ref !== void 0 ? _ref : (column === null || column === void 0 ? void 0 : column.filterType) === FilterType.Date || (column === null || column === void 0 ? void 0 : column.filterType) === FilterType.DateRange ? 160 : getTextWidth(column.header, 14) + 50);
       if (!column.columns) {
         var _ref2, _column$size3;
-        column.size = (_ref2 = (_column$size3 = column.size) !== null && _column$size3 !== void 0 ? _column$size3 : defaultSize) !== null && _ref2 !== void 0 ? _ref2 : (column === null || column === void 0 ? void 0 : column.filterType) === FilterType.Date ? 160 : getTextWidth(column.header, 14) + 50;
+        column.size = (_ref2 = (_column$size3 = column.size) !== null && _column$size3 !== void 0 ? _column$size3 : defaultSize) !== null && _ref2 !== void 0 ? _ref2 : (column === null || column === void 0 ? void 0 : column.filterType) === FilterType.Date || (column === null || column === void 0 ? void 0 : column.filterType) === FilterType.DateRange ? 160 : getTextWidth(column.header, 14) + 50;
         tableColumnsWidth += column.size;
         columnsWidthMap[column.id] = column.size;
       } else {
@@ -109,11 +113,11 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
       format = _ref4$format === void 0 ? defaultDateFormat : _ref4$format;
     // 优先取formattedFilterKey作为key
     var formatKey = filterKey || id;
-    if (filterType === FilterType.Date) {
+    if (filterType === FilterType.Date || filterType === FilterType.DateRange) {
       // 时间范围
       formatFilters["".concat(formatKey, "From")] = value !== null && value !== void 0 && value.startDate ? dayjs(value.startDate).format(format) : '';
       formatFilters["".concat(formatKey, "To")] = value !== null && value !== void 0 && value.endDate ? dayjs(value === null || value === void 0 ? void 0 : value.endDate).format(format) : '';
-    } else if (filterType === FilterType.Integer) {
+    } else if (filterType === FilterType.Integer || filterType === FilterType.NumberRange) {
       // 数字范围
       formatFilters["".concat(formatKey, "From")] = value === null || value === void 0 ? void 0 : value[0];
       formatFilters["".concat(formatKey, "To")] = value === null || value === void 0 ? void 0 : value[1];
@@ -128,6 +132,78 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
   });
   return formatFilters;
 };
+
+// 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
+/**
+ * 不同filterType组件的查询格式：
+ * 1. DateRange/NumberRange：
+ *  1.1 只输入开始：Ge
+ *  1.2 只输入结束：Le
+ *  1.3 都输入：Between
+ * 2. MultiSelect没有填filterType：In
+ * 3. Input/AutoComplete：Contains
+ * 4. SingleDate/SingleNumber/SingleSelect：Eq
+ */
+export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilters) {
+  // console.log('getFormatFilters :>> ', columns, originFilters);
+  var formatFilters = [];
+  originFilters.forEach(function (filter) {
+    var id = filter.id,
+      value = filter.value;
+    var curColumn = columns.find(function (item) {
+      return item.id === id;
+    });
+    var filterType = curColumn.filterType,
+      filterKey = curColumn.filterKey;
+    // const { format = defaultDateFormat } = curColumn.filterComProps || {};
+    // 优先取formattedFilterKey作为key
+    var formatKey = filterKey || id;
+    var res = {
+      field: formatKey,
+      operator: FilterOperator.Contains,
+      value: null
+    };
+    if (filterType === FilterType.Date || filterType === FilterType.DateRange) {
+      // 时间范围
+      if (value !== null && value !== void 0 && value.startDate && !(value !== null && value !== void 0 && value.endDate)) {
+        res.operator = FilterOperator.Ge;
+        res.value = value.startDate;
+      } else if (!(value !== null && value !== void 0 && value.startDate) && value !== null && value !== void 0 && value.endDate) {
+        res.operator = FilterOperator.Le;
+        res.value = value.endDate;
+      } else if (value !== null && value !== void 0 && value.startDate && value !== null && value !== void 0 && value.endDate) {
+        res.operator = FilterOperator.Between;
+        res.value = [value.startDate, value.endDate];
+      }
+    } else if (filterType === FilterType.Integer || filterType === FilterType.NumberRange) {
+      // 数字范围
+      if (!noValue(value === null || value === void 0 ? void 0 : value[0]) && noValue(value === null || value === void 0 ? void 0 : value[1])) {
+        res.operator = FilterOperator.Ge;
+        res.value = value[0];
+      } else if (noValue(value === null || value === void 0 ? void 0 : value[0]) && !noValue(value === null || value === void 0 ? void 0 : value[1])) {
+        res.operator = FilterOperator.Le;
+        res.value = value[1];
+      } else if (!noValue(value === null || value === void 0 ? void 0 : value[0]) && !noValue(value === null || value === void 0 ? void 0 : value[1])) {
+        res.operator = FilterOperator.Between;
+        res.value = value;
+      }
+    } else if (filterType === FilterType.MultiSelect || !filterType) {
+      // 多选组件
+      res.operator = FilterOperator.In;
+      res.value = value;
+    } else if (filterType === FilterType.Input || filterType === FilterType.AutoComplete) {
+      // Input组件
+      res.operator = FilterOperator.Contains;
+      res.value = value;
+    } else {
+      // 其他组件: SingleDate/SingleNumber/SingleSelect
+      res.operator = FilterOperator.Eq;
+      res.value = value;
+    }
+    formatFilters.push(res);
+  });
+  return formatFilters;
+};
 export var getFormatSorting = function getFormatSorting(columns, originSorting) {
   return originSorting.map(function (sort) {
     var curColumn = columns.find(function (item) {
@@ -142,9 +218,6 @@ export var getFormatSorting = function getFormatSorting(columns, originSorting)
     });
   });
 };
-export var noValue = function noValue(value) {
-  return value === undefined || value === null || value === '';
-};
 export var operationColumnNoTooltips = function operationColumnNoTooltips(columns) {
   columns.forEach(function (column) {
     var _id$indexOf, _accessorKey$indexOf;

package/dist/themes/variables.less

@@ -12,7 +12,7 @@
 @sliderRightBorder: var(--sliderRightBorder, #3e3b3b);
 @selectTableRow: var(--select-table-row, #d0e37b);
 @globalColor_table-line: var(--globalColor_table-line, #f0f0f0); // table行分隔线颜色
-@rowHoverBackgroundColor: var(--table-row-hover-bgc, #ececee);
+@rowHoverBackgroundColor: var(--table-row-hover-bgc, #ececee); // 行hover时背景色；选中背景色。
 
 @splite-line: var(--split-line, #ececee);
 @globalColor0: var(--globalColor0, #fdfdfe); // 网格遮罩色
@@ -59,19 +59,19 @@
 @global-table-max-padding-left: var(--global-table-max-padding-left, 8px);
 @global-table-max-padding-right: var(--global-table-max-padding-right, 16px);
 @global-table-max-padding-bottom: var(--global-table-max-padding-bottom, 7px);
-@global-table-max-border: var(--global-table-max-border, 1px solid #D9D9D9);
+@global-table-max-border: var(--global-table-max-border, 1px solid #d9d9d9);
 @global-table-max-footer-border-radius: var(--global-table-max-footer-border-radius);
 @global-table-max-center-border-radius: var(--global-table-max-center-border-radius);
 @global-table-max-center-border-bottom: var(--global-table-max-center-border-bottom);
-@global-table-max-scrollbar-track: var(--global-table-max-scrollbar-track, #E8E8E8);
+@global-table-max-scrollbar-track: var(--global-table-max-scrollbar-track, #e8e8e8);
 @global-table-max-header-font-weight: var(--global-table-max-header-font-weight);
 @global-table-max-body-font-weight: var(--global-table-max-body-font-weight);
 @global-table-max-header-cell-wapper-line-height: var(--global-table-max-header-cell-wapper-line-height, 16px);
 @global-table-body-tbody-tr-td-line-height: var(--global-table-body-tbody-tr-td-line-height, 32px);
 
 // messageTip
-@global-messageTip-background-color: var(--global-messageTip-background-color, #FFFFFF);
-@global-messageTip-text-color: var(--global-messageTip-text-color, #FFFFFF);
+@global-messageTip-background-color: var(--global-messageTip-background-color, #ffffff);
+@global-messageTip-text-color: var(--global-messageTip-text-color, #ffffff);
 @global-messageTip-font-size: var(--global-messageTip-font-size, 14px);
 @global-messageTip-box-shadow: var(--global-messageTip-box-shadow, 0px 4px 8px rgba(0, 0, 0, 0.15));
 @global-messageTip-border-radius: var(--global-messageTip-border-radius, 8px);

package/dist/themes/variablesConfig.js

@@ -237,7 +237,7 @@ export var PublicThemeVariablesConfigTwo = {
     '--scrollThumbHover': '#E8E8E8',
     // rgba(0, 0, 0, 0.3)修改为#E8E8E8
     '--sliderRightBorder': '#221919',
-    '--select-table-row': '#CCDCF4',
+    '--select-table-row': '#EDEDED',
     // 表格行选中颜色-1
     '--split-line': '#ECECEE',
     // 全局可切换颜色变量
@@ -271,7 +271,7 @@ export var PublicThemeVariablesConfigTwo = {
     // 铸轧甘特图连铸板坯默认颜色
     '--globalColor_table-line': '#f0f0f0',
     // table行分隔线颜色
-    '--table-row-hover-bgc': '#ececee',
+    '--table-row-hover-bgc': '#CCDCF4 ',
     // 行hover时背景色
     '--arh-color': 'rgba(0, 0, 0, 0.1)',
     // 列表头拖拽线背景色
@@ -324,7 +324,7 @@ export var PublicThemeVariablesConfigTwo = {
     '--scrollThumbHover': '#1E345B',
     // rgba(255, 255, 255, 0.3)修改为#1E345B
     '--sliderRightBorder': '#3E3B3B',
-    '--select-table-row': '#143B76',
+    '--select-table-row': '#2D3A4D',
     // 表格行选中颜色-1
     // 全局可切换颜色变量
     '--globalColor1': '#FFFFFF',
@@ -357,7 +357,7 @@ export var PublicThemeVariablesConfigTwo = {
     // 铸轧甘特图连铸板坯默认颜色
     '--globalColor_table-line': '#373b54',
     // table行分隔线颜色
-    '--table-row-hover-bgc': '#33476F',
+    '--table-row-hover-bgc': '#143B76',
     // 行hover时背景色，rgb(72,74,87) 修改为 #33476F
     '--arh-color': 'rgba(255, 255, 255, 0.1)',
     // 列表头拖拽线背景色
@@ -404,6 +404,6 @@ export var PublicThemeVariablesConfigTwo = {
   })
 };
 export var publicThemeMap = {
-  'DefaultThemePackage': PublicThemeVariablesConfig,
-  'DyImsBlueThemePackage': PublicThemeVariablesConfigTwo
+  DefaultThemePackage: PublicThemeVariablesConfig,
+  DyImsBlueThemePackage: PublicThemeVariablesConfigTwo
 };

package/dist/utils/request.d.ts

@@ -1,7 +1,8 @@
 /**
- * 仅本地测试用，不要用这个
- * 仅本地测试用，不要用这个
- * 仅本地测试用，不要用这个
+ * @deprecated
+ * 仅本地demo测试用，组件中不要用这个
+ * 仅本地demo测试用，组件中不要用这个
+ * 仅本地demo测试用，组件中不要用这个
  * @en-US https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
  * @zh-CN 配置request请求时的默认参数
  */

package/dist/utils/request.js

@@ -59,13 +59,13 @@ var authHeaderInterceptor = function authHeaderInterceptor(url, options) {
 };
 
 /**
- * 仅本地测试用，不要用这个
- * 仅本地测试用，不要用这个
- * 仅本地测试用，不要用这个
+ * @deprecated
+ * 仅本地demo测试用，组件中不要用这个
+ * 仅本地demo测试用，组件中不要用这个
+ * 仅本地demo测试用，组件中不要用这个
  * @en-US https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
  * @zh-CN 配置request请求时的默认参数
  */
-
 var request = extend({
   // prefix: BaseUrl,
   timeoutMessage: '接口请求超时',

package/package.json

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