@arim-aisdc/public-components 2.2.8 → 2.3.0

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

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont-table"; /* Project id 4453758 */
-  src: url('./iconfont.ttf?t=1730099737796') format('truetype');
+  src: url('iconfont.ttf?t=1740568199599') format('truetype');
 }
 
 .iconfont-table {
@@ -11,12 +11,36 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-table-a-xinzeng21:before {
-  content: "\e62e";
+.icon-table-sort:before {
+  content: "\e890";
 }
 
-.icon-table-a-download11:before {
-  content: "\e62f";
+.icon-table-filter:before {
+  content: "\e88e";
+}
+
+.icon-table-shengji:before {
+  content: "\e64a";
+}
+
+.icon-table-calendar:before {
+  content: "\e888";
+}
+
+.icon-table-edit:before {
+  content: "\e887";
+}
+
+.icon-table-pin:before {
+  content: "\e889";
+}
+
+.icon-table-drag:before {
+  content: "\e88d";
+}
+
+.icon-table-down:before {
+  content: "\e88f";
 }
 
 .icon-table-tight:before {
@@ -27,10 +51,6 @@
   content: "\e87f";
 }
 
-.icon-table-shenglvehao:before {
-  content: "\e62d";
-}
-
 .icon-table-delete:before {
   content: "\e87c";
 }

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 | Element | JSX.Element;
+    text: string | JSX.Element | Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/CustomForm/CustomForm.js

@@ -1,4 +1,5 @@
 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); }
+var _excluded = ["data", "initialValues", "labelCol", "isOkText", "cancelText", "handleSubmit", "handleCancel", "span", "layout", "showButton", "handleInputClear", "usage", "submitLoading", "buttonRender", "labelAlign", "btnSpan"];
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -11,6 +12,8 @@ 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { MinusOutlined } from '@ant-design/icons';
 import { useDebounceFn } from 'ahooks';
 import { AutoComplete, Badge, Button, Cascader, Checkbox, Col, DatePicker, Form, Input, InputNumber, Radio, Row, Select, Spin, Switch } from 'antd';
@@ -104,7 +107,8 @@ var CustomForm = function CustomForm(_ref, ref) {
     buttonRender = _ref$buttonRender === void 0 ? null : _ref$buttonRender,
     _ref$labelAlign = _ref.labelAlign,
     labelAlign = _ref$labelAlign === void 0 ? 'left' : _ref$labelAlign,
-    btnSpan = _ref.btnSpan;
+    btnSpan = _ref.btnSpan,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -661,7 +665,7 @@ var CustomForm = function CustomForm(_ref, ref) {
   };
   return /*#__PURE__*/_jsx("div", {
     id: "CustomForm",
-    children: /*#__PURE__*/_jsx(Form, {
+    children: /*#__PURE__*/_jsx(Form, _objectSpread(_objectSpread({
       ref: ref,
       form: form,
       layout: layout,
@@ -674,7 +678,7 @@ var CustomForm = function CustomForm(_ref, ref) {
       autoComplete: "off",
       onFinish: onFinish
       // onValuesChange={p => console.log('p :>> ', p)}
-      ,
+    }, rest), {}, {
       children: /*#__PURE__*/_jsxs(Row, {
         gutter: {
           md: 8,
@@ -733,7 +737,7 @@ var CustomForm = function CustomForm(_ref, ref) {
           })
         })]
       })
-    })
+    }))
   });
 };
 export default /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(CustomForm));

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

@@ -130,7 +130,7 @@ export type CustomSearchFieldType = {
     /**是否展示时间(默认为true：展示时间) */
     showTime?: boolean;
 };
-export interface CustomFormProps {
+export interface CustomFormProps extends Omit<FormProps, 'labelCol'> {
     data: CustomSearchFieldType[];
     /**初始值 */
     initialValues?: {

package/dist/components/QueryFilter/QueryFilter.js

@@ -1,4 +1,5 @@
 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); }
+var _excluded = ["data", "initialValues", "isOkText", "cancelText", "handleSubmit", "handleCancel", "showButton", "handleInputClear", "submitLoading", "renderButton"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -13,6 +14,8 @@ 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { to } from "../../utils";
 import { MinusOutlined } from '@ant-design/icons';
 import { useDebounceFn } from 'ahooks';
@@ -48,7 +51,8 @@ var QueryFilter = function QueryFilter(_ref, ref) {
     _ref$submitLoading = _ref.submitLoading,
     submitLoading = _ref$submitLoading === void 0 ? false : _ref$submitLoading,
     _ref$renderButton = _ref.renderButton,
-    renderButton = _ref$renderButton === void 0 ? null : _ref$renderButton;
+    renderButton = _ref$renderButton === void 0 ? null : _ref$renderButton,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -603,7 +607,7 @@ var QueryFilter = function QueryFilter(_ref, ref) {
   };
   return /*#__PURE__*/_jsx("div", {
     id: "QueryFilter",
-    children: /*#__PURE__*/_jsxs(Form, {
+    children: /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
       ref: ref,
       form: form
       // name={styles.customForm}
@@ -611,7 +615,8 @@ var QueryFilter = function QueryFilter(_ref, ref) {
       initialValues: handledInitValues,
       labelAlign: "left",
       autoComplete: "off",
-      onFinish: onFinish,
+      onFinish: onFinish
+    }, rest), {}, {
       children: [data.map(function (item, index) {
         var _elementData = getElement(item);
         return /*#__PURE__*/_jsxs("div", {
@@ -671,7 +676,7 @@ var QueryFilter = function QueryFilter(_ref, ref) {
         },
         children: renderButton
       }) : null]
-    })
+    }))
   });
 };
 

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

@@ -1,6 +1,6 @@
+import type { TimePickerProps, TimeRangePickerProps } from 'antd';
 import { FormProps } from 'antd';
 import { MouseEventHandler } from 'react';
-import type { TimeRangePickerProps, TimePickerProps } from 'antd';
 export declare enum FormItemType {
     Text = "text",
     TextArea = "textArea",
@@ -141,12 +141,10 @@ export type searchFieldType = {
     /**预设常用的日期范围  { label: React.ReactNode, value: Dayjs | (() => Dayjs) | Dayjs[] }[]*/
     presets?: TimeRangePickerProps['presets'] | TimePickerProps['presets'];
 };
-export interface QueryFilterProps {
+export interface QueryFilterProps extends FormProps {
     data: searchFieldType[];
     /**初始值 */
     initialValues?: object;
-    /**labelWidth */
-    labelCol?: string;
     /**确认按钮 text */
     isOkText?: string;
     /**取消按钮 text */
@@ -158,7 +156,6 @@ export interface QueryFilterProps {
     /**重置方法 */
     handleCancel: MouseEventHandler<HTMLElement>;
     /** 配置列数，一般是 8 的倍数*/
-    layout?: FormProps['layout'];
     /**是否展示按钮 */
     showButton?: boolean;
     /**输入框清空方法 */

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

@@ -280,16 +280,26 @@ var Row = function Row(_ref) {
     }
   };
 
-  // 当前行是否高亮
-  var isHighLight = useMemo(function () {
-    return !canSelection && String(row.id) === String(rowSelectedId) ||
-    // 单选选中
-    canSelection && selectRowWhenClick && row.getIsSelected() ||
-    // 多选并且点击行时也选中
-    canSelection && !selectRowWhenClick && String(row.id) === String(rowHighLightId) // 多选并且点击行时不选中，高亮状态单独管理
-    ;
+  // 高亮色
+  var highLightClassName = useMemo(function () {
+    if (!canSelection && String(row.id) === String(rowSelectedId)) {
+      // 单选，选中用高亮色显示
+      return 'tbody-tr-highlight';
+    } else if (canSelection) {
+      // 多选
+      if (row.getIsSelected()) {
+        // checked选中用选中色
+        return 'tbody-tr-selected';
+      } else if (String(row.id) === String(rowHighLightId)) {
+        // 高亮状态
+        return 'tbody-tr-highlight';
+      }
+    }
+    return '';
   }, [row.id, row.getIsSelected(), rowSelectedId, selectRowWhenClick, rowHighLightId, canSelection]);
-  console.log('row render');
+
+  // console.log('row render');
+
   var rowCom = function rowCom() {
     var _row;
     return /*#__PURE__*/_jsx("tr", {
@@ -305,7 +315,7 @@ var Row = function Row(_ref) {
       onClick: rowClickOrDoubleClick,
       onMouseEnter: rowMouseEnter,
       onMouseLeave: rowMouseLeave,
-      className: "tbody-tr ".concat(isHighLight ? 'tbody-tr-selected' : '', " ").concat(dropPreviewLineClassName, " ").concat((rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row).map(function (item) {
+      className: "tbody-tr ".concat(highLightClassName, " ").concat(dropPreviewLineClassName, " ").concat((rowClassName === null || rowClassName === void 0 ? void 0 : rowClassName(row).map(function (item) {
         return "".concat(item, "-").concat(theme);
       }).join(' ')) || ''),
       children: (_row = row["getVisibleCells"]) === null || _row === void 0 ? void 0 : _row.call(row).map(function (cell) {
@@ -360,9 +370,7 @@ var Row = function Row(_ref) {
         },
         children: !!(tableBodyRef !== null && tableBodyRef !== void 0 && (_tableBodyRef$current = tableBodyRef.current) !== null && _tableBodyRef$current !== void 0 && _tableBodyRef$current.clientWidth) && /*#__PURE__*/_jsx("div", {
           id: "".concat(tableId, "_expand-table"),
-          className: "subRowWrapper"
-          // 减去10，避免被父表滚动条覆盖
-          ,
+          className: "subRowWrapper",
           style: {
             width: "".concat(tableBodyRef === null || tableBodyRef === void 0 || (_tableBodyRef$current2 = tableBodyRef.current) === null || _tableBodyRef$current2 === void 0 ? void 0 : _tableBodyRef$current2.clientWidth, "px")
           },

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

@@ -18,6 +18,13 @@ table {
   background-color: @globalColor0;
   border-bottom: 1px solid @tableColor2;
 }
+.tbody-tr-highlight {
+  // display: flex;
+  transition: left, top;
+  transition-duration: 0.6s;
+  background-color: @rowHoverBackgroundColor;
+  border-bottom: 1px solid @tableColor2;
+}
 
 .tbody-tr-td-editting {
   // height: auto !important;
@@ -28,6 +35,8 @@ table {
 
 .tbody-tr-td,
 .tbody-tr-td-drag,
+.tbody-tr-highlight > .tbody-tr-td,
+.tbody-tr-highlight > .tbody-tr-td-drag,
 .tbody-tr-selected > .tbody-tr-td,
 .tbody-tr-selected > .tbody-tr-td-drag {
   background-color: @globalColor0;
@@ -45,6 +54,11 @@ table {
   background: @selectTableRow;
 }
 
+.tbody-tr-highlight > .tbody-tr-td,
+.tbody-tr-highlight > .tbody-tr-td-drag {
+  background: @rowHoverBackgroundColor;
+}
+
 .tbody-tr:not(.tbody-tr-selected) {
   &:hover {
     .tbody-tr-td {

package/dist/components/TableMax/TableHeader/Cell.d.ts

@@ -12,6 +12,8 @@ type ICellType = {
     columnResizeMode: ColumnResizeMode;
     disableColumnDrag?: boolean;
     headerRowNum: number;
+    canFilter?: boolean;
+    manualFiltering: boolean;
 };
-declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, }: ICellType) => import("react/jsx-runtime").JSX.Element;
+declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, canFilter, manualFiltering, }: ICellType) => import("react/jsx-runtime").JSX.Element;
 export default Cell;

package/dist/components/TableMax/TableHeader/Cell.js

@@ -22,6 +22,7 @@ import { useDrag, useDrop } from 'react-dnd';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
 import { ColumnType } from "../TableMax";
+import { ColumnFilter } from "../components/ColumnFilterV2";
 import Sort from "../components/ColumnSort";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -39,7 +40,9 @@ var Cell = function Cell(_ref) {
     canSorting = _ref.canSorting,
     getHeaderCellProps = _ref.getHeaderCellProps,
     disableColumnDrag = _ref.disableColumnDrag,
-    headerRowNum = _ref.headerRowNum;
+    headerRowNum = _ref.headerRowNum,
+    canFilter = _ref.canFilter,
+    manualFiltering = _ref.manualFiltering;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var cannotDragColumn = [ColumnType.Darg, ColumnType.Selection, ColumnType.Expander, ColumnType.PlaceHolder];
@@ -86,7 +89,10 @@ var Cell = function Cell(_ref) {
     initPosition = _useState2[0],
     setInitPosition = _useState2[1];
   return /*#__PURE__*/_jsxs("div", {
-    ref: dropRef,
+    ref: function ref(node) {
+      dropRef(node);
+      dragRef(disableColumnDrag || cannotDragColumn.includes(header.column.id) || header.column.getIsPinned() ? null : node);
+    },
     children: [/*#__PURE__*/_jsxs("div", {
       className: "cell-wapper ".concat(columns ? 'wapper-top-parent' : '', " table-max-header-cell-wrapper"),
       ref: previewRef,
@@ -102,13 +108,13 @@ var Cell = function Cell(_ref) {
           y: y
         });
       },
-      children: [/*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: "cell-left",
         onClick: header.column.getToggleSortingHandler(),
         style: {
           textAlign: columns ? 'center' : 'left'
         },
-        children: [!cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
+        children: !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
           placement: "topLeft"
           // @ts-ignore
           ,
@@ -125,17 +131,16 @@ var Cell = function Cell(_ref) {
           })
         }) :
         // @ts-ignore
-        flexRender(columnDef.header, header.getContext()), canSorting ? /*#__PURE__*/_jsx(Sort, {
+        flexRender(columnDef.header, header.getContext())
+      }), !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsxs("div", {
+        className: "cell-right",
+        children: [canSorting && header.column.getCanSort() ? /*#__PURE__*/_jsx(Sort, {
           sort: header.column.getIsSorted()
+        }) : null, canFilter && columnDef.enableColumnFilter !== false ? /*#__PURE__*/_jsx(ColumnFilter, {
+          column: header.column,
+          manualFiltering: manualFiltering
         }) : null]
-      }), /*#__PURE__*/_jsx("div", {
-        className: "cell-right",
-        onClick: header.column.getToggleSortingHandler(),
-        children: disableColumnDrag || cannotDragColumn.includes(header.column.id) || header.column.getIsPinned() ? null : /*#__PURE__*/_jsx("i", {
-          ref: dragRef,
-          className: "icon iconfont-other icon-other-drag drag-handler"
-        })
-      }), /*#__PURE__*/_jsx("div", {
+      }) : null, /*#__PURE__*/_jsx("div", {
         className: "cell-resize-handler ".concat(header.column.getIsResizing() ? 'column-is-resizing' : ''),
         onMouseDown: header.getResizeHandler(),
         onTouchStart: header.getResizeHandler()
@@ -148,9 +153,7 @@ var Cell = function Cell(_ref) {
         height: (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight,
         transform: "translateX(".concat(table.getState().columnSizingInfo.deltaOffset || 0, "px)")
       }
-    }),
-    // document.body,
-    root ? document.querySelector(root) : document.body) : null]
+    }), root ? document.querySelector(root) : document.body) : null]
   });
 };
 export default Cell;

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

@@ -18,6 +18,7 @@ type TableHeaderProps = {
     };
     disableColumnDrag?: boolean;
     headerRowNum: number;
+    manualFiltering: boolean;
 };
-declare const TableHeader: ({ tableContentRef, table, canFilter, enableFilters, canSorting, hasGroup, getHeaderCellProps, columnResizeMode, shadowColumnInfo, disableColumnDrag, rowHeight, headerRowNum, }: TableHeaderProps) => import("react/jsx-runtime").JSX.Element;
+declare const TableHeader: ({ tableContentRef, table, canFilter, enableFilters, canSorting, hasGroup, getHeaderCellProps, columnResizeMode, shadowColumnInfo, disableColumnDrag, rowHeight, headerRowNum, manualFiltering, }: TableHeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default TableHeader;

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

@@ -7,14 +7,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 // import { Column, flexRender } from '@tanstack/react-table';
 // import { useDrag, useDrop } from 'ahooks';
 
-import { Filter } from "../components/ColumnFilter";
+// import { Filter } from '../components/ColumnFilter';
+
 import Cell from "./Cell";
 import "./index.less";
 import { getPinningStyle } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var TableHeader = function TableHeader(_ref) {
-  var _headerGroups, _headerGroups2;
+  var _headerGroups;
   var tableContentRef = _ref.tableContentRef,
     table = _ref.table,
     canFilter = _ref.canFilter,
@@ -26,7 +27,8 @@ var TableHeader = function TableHeader(_ref) {
     shadowColumnInfo = _ref.shadowColumnInfo,
     disableColumnDrag = _ref.disableColumnDrag,
     rowHeight = _ref.rowHeight,
-    headerRowNum = _ref.headerRowNum;
+    headerRowNum = _ref.headerRowNum,
+    manualFiltering = _ref.manualFiltering;
   var headerGroups = table.getHeaderGroups();
   var headers = (headerGroups === null || headerGroups === void 0 || (_headerGroups = headerGroups[headerGroups.length - 1]) === null || _headerGroups === void 0 ? void 0 : _headerGroups.headers) || [];
   var leftLastColumnId = shadowColumnInfo.leftLastColumnId,
@@ -40,8 +42,8 @@ var TableHeader = function TableHeader(_ref) {
           width: size
         }, header.id);
       })
-    }), /*#__PURE__*/_jsxs("thead", {
-      children: [headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
+    }), /*#__PURE__*/_jsx("thead", {
+      children: headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
         return /*#__PURE__*/_jsx("tr", {
           className: "table-thead-tr cus-table-thead-tr",
           style: {
@@ -62,25 +64,14 @@ var TableHeader = function TableHeader(_ref) {
                 getHeaderCellProps: getHeaderCellProps,
                 columnResizeMode: columnResizeMode,
                 disableColumnDrag: disableColumnDrag,
-                headerRowNum: headerRowNum
+                headerRowNum: headerRowNum,
+                canFilter: canFilter,
+                manualFiltering: manualFiltering
               }, header.id)
             }, header.id);
           })
         }, headerGroup.id);
-      }), canFilter && enableFilters ? /*#__PURE__*/_jsx("tr", {
-        className: "table-filter-tr",
-        children: headerGroups === null || headerGroups === void 0 || (_headerGroups2 = headerGroups[headerGroups.length - 1]) === null || _headerGroups2 === void 0 || (_headerGroups2 = _headerGroups2.headers) === null || _headerGroups2 === void 0 ? void 0 : _headerGroups2.map(function (header) {
-          return /*#__PURE__*/_jsx("th", {
-            style: _objectSpread({}, getPinningStyle(header, table)),
-            className: "table-filter-th ".concat(header.id === leftLastColumnId ? 'thead-tr-th-cell-fix-left-last' : '', " ").concat(header.id === rightFirstColumnId ? 'thead-tr-th-cell-fix-right-first' : ''),
-            children: header.column.getCanFilter() ? /*#__PURE__*/_jsx("div", {
-              children: /*#__PURE__*/_jsx(Filter, {
-                column: header.column
-              })
-            }) : null
-          }, header.id + '1');
-        })
-      }, "table-filter-tr") : null]
+      })
     })]
   });
 };

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

@@ -41,6 +41,7 @@ table {
     white-space: nowrap;
     display: flex;
     align-items: center;
+    justify-content: space-between;
 
     .cell-left-header {
       display: -webkit-box;
@@ -56,6 +57,12 @@ table {
     }
   }
 
+  .cell-right {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+  }
+
   .drag-handler {
     color: @tableColor3;
     display: none;

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

@@ -1,7 +1,7 @@
 import { RowData } from '@tanstack/react-table';
 import React from 'react';
 import './tableMax.less';
-import { type TableContextType, type TableMaxProps } from './type';
+import { type TableMaxProps } from './type';
 declare module '@tanstack/react-table' {
     interface TableMeta<TData extends RowData> {
         updateData: (rowIndex: number, columnId: string, value: unknown) => void;
@@ -14,7 +14,6 @@ export declare enum ColumnType {
     Expander = "expander"
 }
 export type ColumnSizing = Record<string, number>;
-export declare const TableContext: React.Context<TableContextType>;
 export declare const CACHE_MAX_AGE: number;
 declare const _default: React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/TableMax/TableMax.js

@@ -24,19 +24,19 @@ import { useUpdateEffect } from 'ahooks';
 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';
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useConfig } from "../ConfigProvider";
 import TableBody from "./TableBody";
 import TableHeader from "./TableHeader";
 import { InputType } from "./components/ColumnEdit";
-import { setDefaultFilterFn } from "./components/ColumnFilter";
-import customFilterFns from "./components/ColumnFilter/customFilterFns";
+import { setDefaultFilterFn } from "./components/ColumnFilterV2";
+import customFilterFns from "./components/ColumnFilterV2/customFilterFns";
 import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
-import { downloadExcel, getFormatFilters, getFormatSorting, operationColumnNoTooltips } from "./utils";
+import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -46,7 +46,8 @@ export var ColumnType = /*#__PURE__*/function (ColumnType) {
   ColumnType["Expander"] = "expander";
   return ColumnType;
 }({});
-export var TableContext = /*#__PURE__*/createContext({});
+// export const TableContext = createContext<TableContextType>({} as TableContextType);
+
 export var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
 var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
@@ -646,6 +647,7 @@ var TableMax = function TableMax(_ref) {
 
   // 筛选回调
   useEffect(function () {
+    console.log('columnFilters :>> ', tableId, columnFilters);
     var filteredRowModel = table.getRowModel();
     var filteredData = filteredRowModel.rows.map(function (item) {
       return item.original;
@@ -660,7 +662,8 @@ var TableMax = function TableMax(_ref) {
         filteredData: filteredData,
         filteredRowModel: filteredRowModel,
         filters: columnFilters,
-        formatFilters: getFormatFilters(columns, columnFilters)
+        formatFilters: getFormatFilters(columns, columnFilters),
+        formatFiltersV2: getFormatFiltersV2(columns, columnFilters) // 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
       });
     }
   }, [JSON.stringify(columnFilters), manualFiltering, tableId]);
@@ -980,7 +983,8 @@ var TableMax = function TableMax(_ref) {
     columnResizeMode: columnResizeMode,
     shadowColumnInfo: shadowColumnInfo,
     disableColumnDrag: disableColumnDrag,
-    compactMode: compactMode
+    compactMode: compactMode,
+    manualFiltering: manualFiltering
   };
   var tableBodyProps = {
     tableContentRef: tableContentRef,

package/dist/components/TableMax/components/{ColumnFilter/FilterDateRange → ColumnFilterV2/DateRange}/index.d.ts

@@ -10,7 +10,8 @@ interface IProps {
         endDate: number | null;
     } | undefined;
     columnDef: TableMaxColumnType;
+    manualFiltering: boolean;
 }
-export declare const FilterDateRange: ({ onChange, value, columnDef }: IProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DateRange: ({ onChange, value, columnDef, manualFiltering }: IProps) => import("react/jsx-runtime").JSX.Element;
 export declare const timeRangeFilter: (row: any, columnId: any, filterValue: any) => boolean;
 export {};