@arim-aisdc/public-components 2.1.0 → 2.1.2

package/dist/assets/iconfont/index.css

@@ -2,3 +2,5 @@
 @import url('./theme-dark/four/iconfont.css');
 @import url('./menu-gray/iconfont.css');
 @import url('./table/iconfont.css');
+@import url('./public/iconfont.css');
+

package/dist/assets/iconfont/public/iconfont.css

@@ -0,0 +1,69 @@
+@font-face {
+  font-family: "iconfont-public"; /* Project id 4386651 */
+  src: url('./iconfont.ttf?t=1730099749830') format('truetype');
+}
+
+.iconfont-public {
+  font-family: "iconfont-public" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-public-guanbiqita:before {
+  content: "\e6db";
+}
+
+.icon-public-shuaxinbiaoqian:before {
+  content: "\e6dc";
+}
+
+.icon-public-guanbibiaoqian:before {
+  content: "\e6dd";
+}
+
+.icon-public-upload:before {
+  content: "\e877";
+}
+
+.icon-public-download:before {
+  content: "\e878";
+}
+
+.icon-public-refresh:before {
+  content: "\e7c1";
+}
+
+.icon-public-edit:before {
+  content: "\e7c2";
+}
+
+.icon-public-calendar:before {
+  content: "\e7c3";
+}
+
+.icon-public-reduce:before {
+  content: "\e7c4";
+}
+
+.icon-public-setting:before {
+  content: "\e7bc";
+}
+
+.icon-public-delete:before {
+  content: "\e7bd";
+}
+
+.icon-public-drag:before {
+  content: "\e7be";
+}
+
+.icon-public-down:before {
+  content: "\e7bf";
+}
+
+.icon-public-pin:before {
+  content: "\e7c0";
+}
+

package/dist/assets/iconfont/table/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
-  font-family: "iconfont-table"; /* Project id 4386651 */
-  src: url('./iconfont.ttf?t=1729650040389') format('truetype');
+  font-family: "iconfont-table"; /* Project id 4453758 */
+  src: url('./iconfont.ttf?t=1730099737796') format('truetype');
 }
 
 .iconfont-table {
@@ -11,59 +11,51 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-table-guanbiqita:before {
-  content: "\e6db";
+.icon-table-a-xinzeng21:before {
+  content: "\e62e";
 }
 
-.icon-table-shuaxinbiaoqian:before {
-  content: "\e6dc";
+.icon-table-a-download11:before {
+  content: "\e62f";
 }
 
-.icon-table-guanbibiaoqian:before {
-  content: "\e6dd";
+.icon-table-tight:before {
+  content: "\e87e";
 }
 
-.icon-table-upload:before {
-  content: "\e877";
-}
-
-.icon-table-download:before {
-  content: "\e878";
-}
-
-.icon-table-refresh:before {
-  content: "\e7c1";
+.icon-table-normal:before {
+  content: "\e87f";
 }
 
-.icon-table-edit:before {
-  content: "\e7c2";
+.icon-table-shenglvehao:before {
+  content: "\e62d";
 }
 
-.icon-table-calendar:before {
-  content: "\e7c3";
+.icon-table-delete:before {
+  content: "\e87c";
 }
 
-.icon-table-reduce:before {
-  content: "\e7c4";
+.icon-table-shuaxin:before {
+  content: "\e87b";
 }
 
-.icon-table-setting:before {
-  content: "\e7bc";
+.icon-table-upload:before {
+  content: "\e878";
 }
 
-.icon-table-delete:before {
-  content: "\e7bd";
+.icon-table-download:before {
+  content: "\e87a";
 }
 
-.icon-table-drag:before {
-  content: "\e7be";
+.icon-table-shezhi:before {
+  content: "\e643";
 }
 
-.icon-table-down:before {
-  content: "\e7bf";
+.icon-table-zhexian:before {
+  content: "\e644";
 }
 
-.icon-table-pin:before {
-  content: "\e7c0";
+.icon-table-biaoge:before {
+  content: "\e645";
 }
 

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/CacheTabs/CacheTabs.d.ts

@@ -5,6 +5,7 @@ export type CacheTabsProps = {
     pathname: string;
     history: any;
     nodeList?: any;
+    shouldCache: boolean;
 };
-declare const _default: ({ useAliveController, pathname, history, nodeList }: CacheTabsProps) => React.ReactElement;
+declare const _default: ({ useAliveController, pathname, history, nodeList, shouldCache }: CacheTabsProps) => React.ReactElement;
 export default _default;

package/dist/components/CacheTabs/CacheTabs.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -5,20 +11,21 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Dropdown, Tabs, Tooltip } from 'antd';
-import React, { useState } from 'react';
+import React, { useState, useMemo, useRef, useEffect } from 'react';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default (function (_ref) {
   var useAliveController = _ref.useAliveController,
     pathname = _ref.pathname,
     history = _ref.history,
-    nodeList = _ref.nodeList;
+    nodeList = _ref.nodeList,
+    shouldCache = _ref.shouldCache;
   // 获取缓存列表
-  var _useAliveController = useAliveController === null || useAliveController === void 0 ? void 0 : useAliveController(),
-    getCachingNodes = _useAliveController.getCachingNodes,
-    dropScope = _useAliveController.dropScope,
-    clear = _useAliveController.clear,
-    refreshScope = _useAliveController.refreshScope;
+  var _ref2 = (useAliveController === null || useAliveController === void 0 ? void 0 : useAliveController()) || {},
+    getCachingNodes = _ref2.getCachingNodes,
+    dropScope = _ref2.dropScope,
+    clear = _ref2.clear,
+    refreshScope = _ref2.refreshScope;
   var cachingNodes = ((getCachingNodes === null || getCachingNodes === void 0 ? void 0 : getCachingNodes()) || nodeList).filter(function (item) {
     return item === null || item === void 0 ? void 0 : item.tabName;
   });
@@ -31,7 +38,7 @@ export default (function (_ref) {
     setOpen = _useState2[1];
 
   // 阻止右键事件冒泡
-  var onRightClick = function onRightClick(e, name) {
+  var _onRightClick = function onRightClick(e, name) {
     return open.open && open.path === name && e.stopPropagation();
   };
 
@@ -125,117 +132,142 @@ export default (function (_ref) {
     var targetKey = JSON.parse(e === null || e === void 0 ? void 0 : e.key).name;
     refreshScope === null || refreshScope === void 0 || refreshScope(targetKey);
   };
-  var labelDropdown = function labelDropdown(name, label) {
-    var lastIndex = cachingNodes.findIndex(function (item) {
-      return item.name === name;
+  var menuItems = useMemo(function () {
+    return [{
+      icon: /*#__PURE__*/_jsx("i", {
+        className: "iconfont-public icon-public-shuaxinbiaoqian"
+      }),
+      label: '刷新标签',
+      key: 'refresh',
+      onClick: onRefresh
+    }, {
+      icon: /*#__PURE__*/_jsx("i", {
+        className: "iconfont-public icon-public-guanbibiaoqian"
+      }),
+      label: '关闭标签',
+      key: 'current',
+      disabled: cachingNodes.length <= 1,
+      onClick: onCurrent
+    }, {
+      icon: /*#__PURE__*/_jsx("i", {
+        className: "iconfont-public icon-public-guanbiqita"
+      }),
+      label: '关闭其他标签页',
+      key: 'other',
+      disabled: cachingNodes.length <= 1,
+      onClick: onOther
+    }
+    // ... other menu items ...
+    ];
+  }, [cachingNodes.length, onRefresh, onCurrent, onOther]);
+  var tabItems = useMemo(function () {
+    return cachingNodes.map(function (item) {
+      return {
+        label: /*#__PURE__*/_jsx(LabelDropdown, {
+          name: item.name,
+          label: item.tabName,
+          onRightClick: function onRightClick(e) {
+            return _onRightClick(e, item.name);
+          },
+          cachingNodes: cachingNodes,
+          setOpen: setOpen,
+          menuItems: menuItems.map(function (menuItem) {
+            return _objectSpread(_objectSpread({}, menuItem), {}, {
+              key: JSON.stringify({
+                name: item.name,
+                key: menuItem.key
+              })
+            });
+          })
+        }),
+        key: item.name,
+        closable: cachingNodes.length > 1
+      };
     });
-    console.log(cachingNodes, lastIndex, 'cachingNodes');
-    return /*#__PURE__*/_jsx("div", {
-      onClick: function onClick(e) {
-        return onRightClick(e, name);
+  }, [cachingNodes, _onRightClick, menuItems]);
+  return /*#__PURE__*/_jsx("div", {
+    style: {
+      display: shouldCache ? 'block' : 'none'
+    },
+    children: /*#__PURE__*/_jsx(Tabs, {
+      hideAdd: true,
+      size: "middle",
+      type: "editable-card",
+      className: "cache-tabs",
+      activeKey: pathname,
+      onTabClick: clickTab,
+      onEdit: editTab,
+      items: tabItems,
+      tabBarGutter: 0
+    })
+  });
+});
+var LabelDropdown = /*#__PURE__*/React.memo(function (_ref3) {
+  var name = _ref3.name,
+    label = _ref3.label,
+    onRightClick = _ref3.onRightClick,
+    cachingNodes = _ref3.cachingNodes,
+    setOpen = _ref3.setOpen,
+    menuItems = _ref3.menuItems;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isOverflowing = _useState4[0],
+    setIsOverflowing = _useState4[1];
+  var labelRef = useRef(null);
+  useEffect(function () {
+    var checkOverflow = function checkOverflow() {
+      if (labelRef.current) {
+        setIsOverflowing(labelRef.current.offsetWidth < labelRef.current.scrollWidth);
+      }
+    };
+    checkOverflow();
+    window.addEventListener('resize', checkOverflow);
+    return function () {
+      return window.removeEventListener('resize', checkOverflow);
+    };
+  }, [label]);
+  return /*#__PURE__*/_jsx("div", {
+    onClick: function onClick(e) {
+      return onRightClick(e, name);
+    },
+    children: /*#__PURE__*/_jsx(Dropdown, {
+      overlayClassName: "cache-tabs-dropdown",
+      trigger: ['contextMenu'],
+      onOpenChange: function onOpenChange(e) {
+        return setOpen({
+          path: name,
+          open: e
+        });
       },
-      children: /*#__PURE__*/_jsx(Dropdown, {
-        overlayClassName: "cache-tabs-dropdown",
-        trigger: ['contextMenu'],
-        onOpenChange: function onOpenChange(e) {
-          return setOpen({
-            path: name,
-            open: e
-          });
+      menu: {
+        items: menuItems
+      },
+      children: /*#__PURE__*/_jsx(Tooltip, {
+        title: isOverflowing ? label : '',
+        color: "var(--globalColor7)",
+        overlayStyle: {
+          border: '1px solid var(--tableColor2)',
+          borderRadius: '6px'
         },
-        menu: {
-          items: [{
-            icon: /*#__PURE__*/_jsx("i", {
-              className: "iconfont-table icon-table-shuaxinbiaoqian"
-            }),
-            label: '刷新标签',
-            key: JSON.stringify({
-              name: name,
-              key: 'refresh'
-            }),
-            onClick: onRefresh
-          }, {
-            icon: /*#__PURE__*/_jsx("i", {
-              className: "iconfont-table icon-table-guanbibiaoqian"
-            }),
-            label: '关闭标签',
-            key: JSON.stringify({
-              name: name,
-              key: 'current'
-            }),
-            disabled: cachingNodes.length <= 1,
-            onClick: onCurrent
-          }, {
-            icon: /*#__PURE__*/_jsx("i", {
-              className: "iconfont-table icon-table-guanbiqita"
-            }),
-            label: '关闭其他标签页',
-            key: JSON.stringify({
-              name: name,
-              key: 'other'
-            }),
-            disabled: cachingNodes.length <= 1,
-            onClick: onOther
-          }
-          // {
-          //   icon: '',
-          //   label: '关闭左侧',
-          //   key: JSON.stringify({ name, key: 'left' }),
-          //   disabled: lastIndex === 0,
-          //   onClick: onLeft,
-          // },
-          // {
-          //   label: '关闭右侧',
-          //   key: JSON.stringify({ name, key: 'right' }),
-          //   disabled: lastIndex === cachingNodes.length - 1,
-          //   onClick: onRight,
-          // },
-          // {
-          //   label: '重新加载',
-          //   key: JSON.stringify({ name, key: 'refresh' }),
-          //   onClick: onRefresh,
-          // },
-          ]
+        overlayInnerStyle: {
+          padding: '6px 16px',
+          borderRadius: '6px',
+          color: 'var(--globalColor1)',
+          background: 'var(--globalColor1)',
+          fontSize: '14px',
+          lineHeight: '28px'
         },
-        children: /*#__PURE__*/_jsx(Tooltip, {
-          title: name,
-          color: "var(--globalColor7)",
-          overlayStyle: {
-            border: '1px solid var(--tableColor2)',
-            borderRadius: '6px'
-          },
-          overlayInnerStyle: {
-            padding: '6px 16px',
-            borderRadius: '6px',
-            color: 'var(--globalColor1)',
-            background: 'var(--globalColor1)',
-            fontSize: '14px',
-            lineHeight: '28px'
+        children: /*#__PURE__*/_jsx("div", {
+          ref: labelRef,
+          className: cachingNodes.length > 1 ? 'dropdown-label' : '',
+          style: {
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap'
           },
-          children: /*#__PURE__*/_jsx("div", {
-            className: cachingNodes.length > 1 ? 'dropdown-label' : '',
-            children: label
-          })
-        }, name)
-      })
-    });
-  };
-  var tabItems = cachingNodes.map(function (item) {
-    return {
-      label: labelDropdown(item.name, item.tabName),
-      key: item.name,
-      closable: cachingNodes.length > 1
-    };
-  });
-  return /*#__PURE__*/_jsx(Tabs, {
-    hideAdd: true,
-    size: "middle",
-    type: "editable-card",
-    className: "cache-tabs",
-    activeKey: pathname,
-    onTabClick: clickTab,
-    onEdit: editTab,
-    items: tabItems,
-    tabBarGutter: 0
+          children: label
+        })
+      }, name)
+    })
   });
 });

package/dist/components/CacheTabs/index.less

@@ -20,6 +20,7 @@
     color: @globalColor2;
     height: 100% !important;
     padding: 0 12px !important;
+    pointer-events: auto;
   }
   &>.ant-tabs-nav .ant-tabs-tab-active {
     background: @globalColor7 !important;
@@ -29,6 +30,11 @@
       color: @globalColor1 !important;
     }
   }
+  &>.ant-tabs-nav .ant-tabs-tab:hover {
+    background: @globalColor7 !important;
+    border-radius: 6px 6px 0 0 !important;
+    border: 0 !important;
+  }
   &>.ant-tabs-nav::before {
     z-index: 1;
     border-bottom: 1px solid @tableColor7;
@@ -49,11 +55,11 @@
     border-left: none !important;
     content: '';
   }
-  .dropdown-label {
+  .ant-dropdown-trigger,.dropdown-label {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    max-width: 84px;
+    max-width: 96px;
   }
   &>.ant-tabs-nav .ant-tabs-tab .ant-tabs-tab-remove {
     padding: 0 !important;
@@ -64,7 +70,7 @@
     width: 16px;
     height: 16px;
     border-radius: 8px;
-    color: @global-icon-color;
+    color: @global-icon-text-color;
     font-size: 10px;
     &:hover {
       background: @globalColor_14;
@@ -80,7 +86,7 @@
   .ant-dropdown-menu {
     padding: 0 !important;
     border-radius: 6px !important;
-    background: @global-row-hover-background-color;
+    background: @global-hover-background-color;
     box-shadow: 0px 5px 12px -4px @global-hover-box-shadow-color;
     border-radius: 6px 6px 6px 6px;
     border: 1px solid @tableColor7;
@@ -97,10 +103,13 @@
   .ant-dropdown-menu-item-active, .ant-dropdown-menu-item:hover {
     background: @globalColor_14 !important;
   }
+  .ant-dropdown-menu-item-disabled, .ant-dropdown-menu-item-disabled:hover {
+    background: @global-disabled-background-color !important;
+  }
   .iconfont-table {
     font-size: 16px !important;
     line-height: 22px !important;
-    color: @global-icon-color !important;
+    color: @global-icon-text-color !important;
     margin-right: 4px;
     margin-top: 2px;
   }

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

@@ -29,6 +29,8 @@ export interface ConditionExpressionPropsType {
     }[];
     /** 第一个参数的Select的labelInValue属性 */
     labelInValue?: boolean;
+    /** 是否支持前端筛选 */
+    canFrontFilter?: boolean;
 }
 declare const _default: React.NamedExoticComponent<ConditionExpressionPropsType>;
 export default _default;

package/dist/components/ConditionExpression/index.js

@@ -10,9 +10,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { Input, Select, Tooltip } from 'antd';
+import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
+import { Button, Input, Select, Tooltip } from 'antd';
 import { cloneDeep } from 'lodash';
 import React from 'react';
+import Icon from "../Icon";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -65,7 +67,8 @@ var ConditionExpression = function ConditionExpression(_ref) {
     _ref$showParameter = _ref.showParameter,
     showParameter = _ref$showParameter === void 0 ? true : _ref$showParameter,
     parameterOptions = _ref.parameterOptions,
-    labelInValue = _ref.labelInValue;
+    labelInValue = _ref.labelInValue,
+    canFrontFilter = _ref.canFrontFilter;
   /** 添加条件触发 */
   var addExpression = function addExpression(index) {
     var _conditionExpressionItem = value.map(function (e, i) {
@@ -158,76 +161,85 @@ var ConditionExpression = function ConditionExpression(_ref) {
   var getConditionExpressionItem = function getConditionExpressionItem(item, index, notFirst) {
     return /*#__PURE__*/_jsxs("div", {
       className: 'condition-all',
-      children: [notFirst && conditionLink(value === null || value === void 0 ? void 0 : value[index[0] - 1].logicOperator, 'logicOperatorByGroup', [index[0] - 1]), /*#__PURE__*/_jsxs("div", {
-        className: 'condition-all-undelete',
-        children: [item === null || item === void 0 ? void 0 : item.map(function (e, i) {
-          var _value$index$, _value$index$2, _value$index$3, _value$index$4;
-          return /*#__PURE__*/_jsxs("div", {
-            style: {
-              display: 'flex',
-              alignItems: 'center'
-            },
-            children: [/*#__PURE__*/_jsxs("div", {
-              className: 'condition-item',
-              children: [showParameter && /*#__PURE__*/_jsx("div", {
-                className: 'condition-select-left',
-                children: /*#__PURE__*/_jsx(Select, {
-                  value: value === null || value === void 0 || (_value$index$ = value[index[0]]) === null || _value$index$ === void 0 || (_value$index$ = _value$index$.conditionItem[i]) === null || _value$index$ === void 0 ? void 0 : _value$index$.arguments,
-                  placeholder: '请选择参数',
-                  options: parameterOptions,
-                  labelInValue: labelInValue,
-                  onChange: function onChange(data) {
-                    return dataChange('arguments', data, [index[0], i]);
-                  }
-                })
-              }), /*#__PURE__*/_jsx("div", {
-                className: 'condition-select-middle',
-                children: /*#__PURE__*/_jsx(Select, {
-                  value: (_value$index$2 = value[index[0]]) === null || _value$index$2 === void 0 || (_value$index$2 = _value$index$2.conditionItem[i]) === null || _value$index$2 === void 0 ? void 0 : _value$index$2.operator,
-                  style: {
-                    width: '118px'
-                  },
-                  placeholder: '操作符',
-                  defaultValue: '=',
-                  options: operatorOptions,
-                  onChange: function onChange(data) {
-                    return dataChange('operator', data, [index[0], i]);
-                  }
-                })
-              }), /*#__PURE__*/_jsxs("div", {
-                className: 'condition-input-right',
-                children: [/*#__PURE__*/_jsx(Input, {
-                  value: value === null || value === void 0 || (_value$index$3 = value[index[0]]) === null || _value$index$3 === void 0 || (_value$index$3 = _value$index$3.conditionItem[i]) === null || _value$index$3 === void 0 ? void 0 : _value$index$3.argumentsValue,
-                  placeholder: '参数值',
-                  onChange: function onChange(data) {
-                    var _data$target;
-                    return dataChange('argumentsValue', data === null || data === void 0 || (_data$target = data.target) === null || _data$target === void 0 ? void 0 : _data$target.value, [index[0], i]);
-                  }
-                }), tooltipList.includes((_value$index$4 = value[index[0]]) === null || _value$index$4 === void 0 || (_value$index$4 = _value$index$4.conditionItem[i]) === null || _value$index$4 === void 0 ? void 0 : _value$index$4.operator) && /*#__PURE__*/_jsx(Tooltip, {
-                  title: tooltipTitle,
-                  children: /*#__PURE__*/_jsx("i", {
-                    className: "iconfont-other icon-other-info ".concat('condition-tooltip')
+      children: [notFirst && conditionLink(value === null || value === void 0 ? void 0 : value[index[0] - 1].logicOperator, 'logicOperatorByGroup', [index[0] - 1]), /*#__PURE__*/_jsx("div", {
+        className: "condition-all-content",
+        children: /*#__PURE__*/_jsxs("div", {
+          className: 'condition-all-undelete',
+          children: [item === null || item === void 0 ? void 0 : item.map(function (e, i) {
+            var _value$index$, _value$index$2, _value$index$3, _value$index$4;
+            return /*#__PURE__*/_jsxs("div", {
+              style: {
+                display: 'flex',
+                alignItems: 'center'
+              },
+              children: [/*#__PURE__*/_jsxs("div", {
+                className: 'condition-item',
+                children: [showParameter && /*#__PURE__*/_jsx("div", {
+                  className: 'condition-select-left',
+                  children: /*#__PURE__*/_jsx(Select, {
+                    value: value === null || value === void 0 || (_value$index$ = value[index[0]]) === null || _value$index$ === void 0 || (_value$index$ = _value$index$.conditionItem[i]) === null || _value$index$ === void 0 ? void 0 : _value$index$.arguments,
+                    placeholder: '请选择参数',
+                    options: parameterOptions,
+                    labelInValue: labelInValue,
+                    onSelect: function onSelect(data) {
+                      return dataChange('arguments', data, [index[0], i]);
+                    },
+                    showSearch: canFrontFilter,
+                    filterOption: canFrontFilter ? function (input, option) {
+                      var _option$label;
+                      return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').toLowerCase().includes(input.toLowerCase());
+                    } : true
+                  })
+                }), /*#__PURE__*/_jsx("div", {
+                  className: 'condition-select-middle',
+                  children: /*#__PURE__*/_jsx(Select, {
+                    value: (_value$index$2 = value[index[0]]) === null || _value$index$2 === void 0 || (_value$index$2 = _value$index$2.conditionItem[i]) === null || _value$index$2 === void 0 ? void 0 : _value$index$2.operator,
+                    style: {
+                      width: '118px'
+                    },
+                    placeholder: '操作符',
+                    defaultValue: '=',
+                    options: operatorOptions,
+                    onChange: function onChange(data) {
+                      return dataChange('operator', data, [index[0], i]);
+                    }
                   })
+                }), /*#__PURE__*/_jsxs("div", {
+                  className: 'condition-input-right',
+                  children: [/*#__PURE__*/_jsx(Input, {
+                    value: value === null || value === void 0 || (_value$index$3 = value[index[0]]) === null || _value$index$3 === void 0 || (_value$index$3 = _value$index$3.conditionItem[i]) === null || _value$index$3 === void 0 ? void 0 : _value$index$3.argumentsValue,
+                    placeholder: '参数值',
+                    onChange: function onChange(data) {
+                      var _data$target;
+                      return dataChange('argumentsValue', data === null || data === void 0 || (_data$target = data.target) === null || _data$target === void 0 ? void 0 : _data$target.value, [index[0], i]);
+                    }
+                  }), tooltipList.includes((_value$index$4 = value[index[0]]) === null || _value$index$4 === void 0 || (_value$index$4 = _value$index$4.conditionItem[i]) === null || _value$index$4 === void 0 ? void 0 : _value$index$4.operator) && /*#__PURE__*/_jsx(Tooltip, {
+                    title: tooltipTitle,
+                    children: /*#__PURE__*/_jsx("i", {
+                      className: "iconfont-other icon-other-info ".concat('condition-tooltip')
+                    })
+                  })]
+                }), item.length > 1 && /*#__PURE__*/_jsx(CloseOutlined, {
+                  className: "condition-item-del",
+                  onClick: function onClick() {
+                    return itemDelOnClick([index[0], i]);
+                  }
                 })]
-              }), item.length > 1 && /*#__PURE__*/_jsx("i", {
-                className: "iconfont-other icon-other-cancel ".concat('condition-item-del'),
-                onClick: function onClick() {
-                  return itemDelOnClick([index[0], i]);
-                }
-              })]
-            }), i !== item.length - 1 && conditionLink(value === null || value === void 0 ? void 0 : value[index[0]].conditionItem[i].logicOperator, 'logicOperator', [index[0], i])]
-          }, "condition-item-".concat(index[0], "-").concat(i));
-        }), /*#__PURE__*/_jsx("div", {
-          className: 'condition-add',
-          onClick: function onClick() {
-            return addExpression(index);
-          },
-          children: /*#__PURE__*/_jsx("i", {
-            className: 'iconfont-other icon-other-add'
-          })
-        })]
-      }), value.length > 1 && /*#__PURE__*/_jsx("i", {
-        className: "iconfont-other icon-other-cancel ".concat('condition-del'),
+              }), i !== item.length - 1 && conditionLink(value === null || value === void 0 ? void 0 : value[index[0]].conditionItem[i].logicOperator, 'logicOperator', [index[0], i])]
+            }, "condition-item-".concat(index[0], "-").concat(i));
+          }), /*#__PURE__*/_jsx("div", {
+            className: 'condition-add',
+            onClick: function onClick() {
+              return addExpression(index);
+            },
+            children: /*#__PURE__*/_jsx(Icon, {
+              prefix: 'other',
+              name: 'add'
+            })
+          })]
+        })
+      }), value.length > 1 && /*#__PURE__*/_jsx(CloseOutlined, {
+        className: "condition-del",
         onClick: function onClick() {
           return delOnClick(index);
         }
@@ -238,14 +250,11 @@ var ConditionExpression = function ConditionExpression(_ref) {
     className: 'condition-expression-item',
     children: [value === null || value === void 0 ? void 0 : value.map(function (e, index) {
       return getConditionExpressionItem(e.conditionItem, [index], index !== 0);
-    }), /*#__PURE__*/_jsxs("div", {
-      className: 'condition-add-group',
+    }), /*#__PURE__*/_jsx(Button, {
       onClick: addGroup,
-      children: [/*#__PURE__*/_jsx("i", {
-        className: 'iconfont-other icon-other-add'
-      }), /*#__PURE__*/_jsx("span", {
-        children: "\u5206\u7EC4"
-      })]
+      className: 'condition-add-group',
+      icon: /*#__PURE__*/_jsx(PlusOutlined, {}),
+      children: "\u5206\u7EC4"
     })]
   });
 };

package/dist/components/ConditionExpression/index.less

@@ -1,42 +1,49 @@
 .condition-expression-item {
   display: flex;
   padding: 6px 0;
+  padding-right: 6px;
   grid-auto-flow: column;
-  overflow-x: auto;
   flex-direction: column;
   justify-content: flex-start;
   align-items: flex-start;
+  overflow-x: hidden;
 
   .condition-all {
     display: flex;
     align-items: center;
     position: relative;
-    margin-bottom: 6px;
+    margin-bottom: 12px;
+    max-width: 100%;
+
+    .condition-all-content {
+      overflow: auto;
+    }
 
     /* 添加相对定位 */
     .condition-all-undelete {
       display: flex;
       align-items: center;
       position: relative;
-      border: 1px dashed #e0e0e0;
+      border: 1px dashed @global-card-effect-background-color;
       border-radius: 6px;
+      padding: 6px 8px 6px 6px;
 
       .condition-item {
         display: flex;
         align-items: center;
         position: relative;
+        padding-right: 8px;
 
         .condition-select-left {
-          padding: 6px 4px;
+          padding-right: 4px;
+          width: 120px;
         }
 
         .condition-select-middle {
-          padding: 6px 4px;
+          padding-right: 4px;
         }
 
         .condition-input-right {
-          padding: 6px 4px;
-          margin-right: 4px;
           width: 88px;
 
           .condition-tooltip {
@@ -50,13 +57,13 @@
         .condition-item-del {
           border-radius: 50%;
           background-color: @globalColor8;
-          line-height: 16px;
-          height: 16;
-          width: 16;
-          font-size: 16px;
+          line-height: 18px;
+          height: 16px;
+          width: 16px;
+          font-size: 9px;
           display: none;
           position: absolute;
-          top: 0;
+          top: -6px;
           right: 0;
           cursor: pointer;
           border: none;
@@ -65,15 +72,8 @@
       }
 
       .condition-add {
-        display: flex;
-        width: 36px;
-        height: 36px;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-
         i {
-          font-size: 24px;
+          font-size: 20px;
         }
       }
     }
@@ -85,10 +85,10 @@
     .condition-del {
       border-radius: 50%;
       background-color: @globalColor8;
-      line-height: 16px;
-      height: 16;
-      width: 16;
-      font-size: 16px;
+      line-height: 18px;
+      height: 16px;
+      width: 16px;
+      font-size: 9px;
       display: none;
       position: absolute;
       top: -6px;
@@ -106,20 +106,4 @@
   .condition-link {
     padding-right: 8px;
   }
-
-  .condition-add-group {
-    display: flex;
-    flex-shrink: 0;
-    width: auto;
-    border: 2px solid @splite-line;
-    border-radius: 6px;
-    padding: 4px;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-
-    span {
-      padding-left: 6px;
-    }
-  }
 }

package/dist/components/CustomForm/CustomForm.js

@@ -650,7 +650,8 @@ var CustomForm = function CustomForm(_ref, ref) {
           lg: 12,
           xl: 12,
           xxl: 24
-        }
+        },
+        className: "customFormRow"
         // justify="space-between"
         ,
         children: [data.map(function (item, index) {

package/dist/components/CustomForm/index.less

@@ -5,11 +5,15 @@
 .btnContainer {
   width: 100%;
   text-align: right;
+  margin-top: 12px !important;
+  padding-top: 0 !important;
 }
 
 .formBtnContainer {
   width: 100%;
   text-align: center;
+  margin-top: 12px !important;
+  padding-top: 0 !important;
 }
 
 .sectionInput {
@@ -60,3 +64,13 @@
 .custom-light-input-number {
   width: 100% !important;
 }
+
+.customFormRow {
+  .ant-col {
+    &:last-child {
+      .ant-form-item {
+        margin-bottom: 0;
+      }
+    }
+  }
+}

package/dist/components/TableMax/TableBody/Row.js

@@ -253,6 +253,8 @@ var Row = function Row(_ref) {
   };
   var rowMouseLeave = function rowMouseLeave() {
     onRowMouseLeave === null || onRowMouseLeave === void 0 || onRowMouseLeave(row);
+    // 鼠标移出，清除border
+    clearHoverRowIndex === null || clearHoverRowIndex === void 0 || clearHoverRowIndex();
   };
   var handleCellRightClick = function handleCellRightClick(e, cell) {
     onCellContextMenu(e, cell);

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

@@ -130,6 +130,7 @@ table {
       justify-content: center;
       align-items: center;
       width: 100%;
+      height: 100%;
 
       .empty-img {
         height: 80px;

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

@@ -43,11 +43,12 @@ table {
     align-items: center;
 
     .cell-left-header {
-      display: box;
+      display: -webkit-box;
       -webkit-box-orient: vertical;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: normal;
+      word-break: break-all;
 
       .ant-checkbox-wrapper {
         line-height: 16px;

package/dist/components/TableMax/TableMax.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { MinusSquareOutlined, PlusSquareOutlined } from '@ant-design/icons';
 import { getCoreRowModel, getExpandedRowModel, getFacetedUniqueValues, getFilteredRowModel, getSortedRowModel, useReactTable } from '@tanstack/react-table';
 import { useUpdateEffect } from 'ahooks';
-import { Button, Checkbox, Dropdown, Form, Pagination, Upload } from 'antd';
+import { Button, Checkbox, Form, Pagination, Upload } from 'antd';
 import dayjs from 'dayjs';
 import { cloneDeep, debounce } from 'lodash';
 import React, { createContext, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
@@ -35,7 +35,6 @@ import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import PaginationV2 from "./components/PaginationV2";
 import "./tableMax.less";
-import { LayoutType, layoutOptions } from "./type";
 import { downloadExcel, getFormatFilters, getFormatSorting, getSizeInfo, operationColumnNoTooltips } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -1136,10 +1135,9 @@ var TableMax = function TableMax(_ref) {
 
   // console.log('columnsSizeMap render');
 
-  var changeCompactMode = useCallback(function (_ref6) {
-    var key = _ref6.key;
-    setCompactMode(key === LayoutType.COMPACT);
-  }, []);
+  var changeCompactMode = function changeCompactMode() {
+    setCompactMode(!compactMode);
+  };
   return /*#__PURE__*/_jsx(Form, {
     form: form,
     component: false,
@@ -1235,24 +1233,13 @@ var TableMax = function TableMax(_ref) {
               marginRight: 0
             },
             onClick: handleClickDelete
-          }), canCompact && /*#__PURE__*/_jsx(Dropdown, {
-            menu: {
-              items: layoutOptions,
-              onClick: changeCompactMode,
-              selectable: true,
-              defaultSelectedKeys: [compactMode ? LayoutType.COMPACT : LayoutType.NORMAL]
+          }), canCompact && /*#__PURE__*/_jsx("i", {
+            className: "iconfont-table ".concat(compactMode ? 'icon-table-normal' : 'icon-table-tight', "  handleRightItem"),
+            style: {
+              fontSize: '16px',
+              marginRight: 0
             },
-            placement: "bottomRight",
-            children: /*#__PURE__*/_jsx("i", {
-              className: "iconfont-table icon-table-midu handleRightItem",
-              style: {
-                fontSize: '16px',
-                marginRight: 0
-              },
-              onClick: function onClick(e) {
-                return e.preventDefault();
-              }
-            })
+            onClick: changeCompactMode
           }), canSetting && /*#__PURE__*/_jsx(ColumnSetting, {
             table: table,
             tableId: tableId,

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, Select, Switch, Tooltip } from 'antd';
+import { Checkbox, Segmented, Switch, Tooltip } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
@@ -31,12 +31,6 @@ var headerRowNumOptions = [{
 }, {
   value: 3,
   label: '3行'
-}, {
-  value: 4,
-  label: '4行'
-}, {
-  value: 5,
-  label: '5行'
 }];
 var SettingItem = function SettingItem(_ref) {
   var _column$columnDef, _column$columnDef2;
@@ -363,17 +357,12 @@ var ColumnSetting = function ColumnSetting(_ref3) {
           className: "header-row-num-setting",
           children: [/*#__PURE__*/_jsx("span", {
             children: "\u6807\u9898\u884C\u6570"
-          }), /*#__PURE__*/_jsx(Select, {
-            size: "small",
+          }), /*#__PURE__*/_jsx(Segmented, {
+            options: headerRowNumOptions,
+            value: headerRowNum,
+            onChange: onHeaderRowNumChange,
             style: {
-              width: 80,
               marginLeft: 12
-            },
-            defaultValue: headerRowNum,
-            onChange: onHeaderRowNumChange,
-            options: headerRowNumOptions,
-            getPopupContainer: function getPopupContainer() {
-              return configWrapperRef.current;
             }
           })]
         })]

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

@@ -33,6 +33,28 @@
       display: flex;
       align-items: center;
       width: 100%;
+      color: @global-default-text-color;
+      .ant-segmented {
+        background: @global-card-background-color;
+        height: 28px;
+        padding: 2px;
+        .ant-segmented-thumb {
+          background: @global-card-effect-background-color;
+        }
+        .ant-segmented-item {
+          color: @global-default-text-color;
+          height: 24px;
+          width: 46px;
+          .ant-segmented-item-label {
+            height: 24px;
+            line-height: 24px;
+            min-height: 24px;
+          }
+        }
+        .ant-segmented-item-selected {
+          background: @global-card-effect-background-color;
+        }
+      }
     }
   }
 }

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) => 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;
+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;
 declare const customSortFns: {
-    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;
+    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;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

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

@@ -1,9 +1,10 @@
 .table-max-dragger-layer-wrapper {
   position: fixed;
   pointer-events: none;
-  opacity: 0.5;
+  // opacity: 0.5;
   left: 0;
   top: 0;
+  z-index: 9999;
 
   .tbody-tr,
   .tbody-tr-selected {
@@ -16,8 +17,8 @@
   .tbody-tr-td-drag,
   .tbody-tr-selected > .tbody-tr-td,
   .tbody-tr-selected > .tbody-tr-td-drag {
-    background-color: @globalColor0;
-    border-bottom: 1px solid @tableColor2;
+    background-color: @global-card-effect-background-color;
+    // border-bottom: 1px solid @tableColor2;
     height: 32px;
     line-height: 32px;
     padding: 0 8px;
@@ -31,7 +32,7 @@
 
   .tbody-tr-selected > .tbody-tr-td,
   .tbody-tr-selected > .tbody-tr-td-drag {
-    background: @selectTableRow;
+    background: @global-card-effect-background-color;
   }
 
   .tbody-tr-td-drag:hover {

package/dist/themes/variables.less

@@ -44,7 +44,13 @@
 @tableColor8: var(--tableColor8, #f5f6f7); // 表格列设置区-列表元素hover背景色
 @tableTooltipBgc: var(--tableTooltipBgc, #f5f6f7); // 表格tooltip背景色
 @tableSettingModalBgc: var(--tableSettingModalBgc, #ffffff); // 表格的body的背景底色
-@global-tip-text-color: var(--global-tip-text-color, rgba(255,255,255,0.45)); //提醒色/暂无数据颜色/placeholder颜色
+@global-tip-text-color: var(--global-tip-text-color, rgba(255, 255, 255, 0.45)); //提醒色/暂无数据颜色/placeholder颜色
 @global-icon-color: var(--global-icon-color, #ffffff); //图标色
-@global-row-hover-background-color: var(--global-row-hover-background-color, #010C31f2); // 表格行hover背景色
+@global-hover-background-color: var(--global-hover-background-color, #010c31f2); // 表格行hover背景色
 @global-hover-box-shadow-color: var(--global-hover-box-shadow-color, #03062173); // hover/右键框投影颜色
+@global-disabled-background-color: var(--global-disabled-background-color, #0f2347); // 禁用背景色
+
+@global-icon-text-color: var(--global-icon-text-color, #455169);
+@global-card-background-color: var(--global-card-background-color, #0c1b3b);
+@global-card-effect-background-color: var(--global-card-effect-background-color, #1e345b);
+@global-default-text-color: var(--global-default-text-color, #fff);

package/dist/themes/variablesConfig.js

@@ -61,12 +61,17 @@ export var PublicThemeVariablesConfig = {
     // 表格tooltip背景色
     '--global-desc-text-disabled-color': '#d3e7fa3f',
     // 全局默认 禁用/选中 字体颜色
-    '--tableSettingModalBgc': '#FFFFFF',
+    '--tableSettingModalBgc': '#FFFFFFF2',
     // 表格的body的背景底色
-    '--global-tip-text-color': "rgba(36,42,48,0.45)",
-    '--global-icon-color': "#455169",
-    '--global-row-hover-background-color': "#ebebebf2",
-    '--global-hover-box-shadow-color': "#0306211a"
+    '--global-tip-text-color': 'rgba(36,42,48,0.45)',
+    '--global-icon-color': '#455169',
+    '--global-hover-background-color': '#ebebebf2',
+    '--global-hover-box-shadow-color': '#0306211a',
+    '--global-disabled-background-color': '#F2F2F2',
+    '--global-icon-text-color': '#fff',
+    '--global-card-background-color': '#F7F7F8',
+    '--global-card-effect-background-color': '#E8E8E8',
+    '--global-default-text-color': '#242A30'
   },
   dark: {
     '--global-curd-input-background-color': '#494c5dff',
@@ -131,12 +136,17 @@ export var PublicThemeVariablesConfig = {
     // 表格tooltip背景色
     '--global-desc-text-disabled-color': '#d3e7fa3f',
     // 全局默认 禁用/选中 字体颜色
-    '--tableSettingModalBgc': '#05081A',
+    '--tableSettingModalBgc': '#0F2347F2',
     // 表格的body的背景底色
-    '--global-tip-text-color': "rgba(255,255,255,0.45)",
+    '--global-tip-text-color': 'rgba(255,255,255,0.45)',
     // 提醒色/暂无数据颜色/placeholder颜
-    '--global-icon-color': "#fff",
-    '--global-row-hover-background-color': "#010C31f2",
-    '--global-hover-box-shadow-color': "#03062173"
+    '--global-icon-color': '#fff',
+    '--global-hover-background-color': '#010C31f2',
+    '--global-hover-box-shadow-color': '#03062173',
+    '--global-disabled-background-color': '#0F2347',
+    '--global-icon-text-color': '#455169',
+    '--global-card-background-color': '#0C1B3B',
+    '--global-card-effect-background-color': '#1E345B',
+    '--global-default-text-color': '#fff'
   }
 };

package/dist/utils/request.d.ts

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

package/dist/utils/request.js

@@ -58,6 +58,9 @@ var authHeaderInterceptor = function authHeaderInterceptor(url, options) {
 };
 
 /**
+ * 仅本地测试用，不要用这个
+ * 仅本地测试用，不要用这个
+ * 仅本地测试用，不要用这个
  * @en-US https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
  * @zh-CN 配置request请求时的默认参数
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -51,7 +51,6 @@
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.9.1",
     "ahooks": "^3.7.8",
-    "antd": "^5.18.3",
     "classnames": "^2.5.1",
     "css-vars-ponyfill": "^2.4.8",
     "dayjs": "^1.11.11",
@@ -67,8 +66,7 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-draggable": "^4.4.6",
     "react-router-dom": "^6.22.3",
-    "react-split-pane": "^0.1.92",
-    "umi-request": "^1.4.0"
+    "react-split-pane": "^0.1.92"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",