@arim-aisdc/public-components 2.3.96 → 2.3.98

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

@@ -15,6 +15,23 @@ export type conditionExpressionItemType = {
     /**与下一组条件表达式连接符 */
     logicOperator?: string | null;
 };
+export type ConditionExpressionOptionType = {
+    label: any;
+    value: any;
+    [key: string]: any;
+};
+export type ConditionExpressionParameterOptionsRequestParams = {
+    page: number;
+    pageSize: number;
+    keyword?: string;
+    groupIndex?: number;
+    conditionIndex?: number;
+};
+export type ConditionExpressionParameterOptionsRequestResult = ConditionExpressionOptionType[] | {
+    options: ConditionExpressionOptionType[];
+    total?: number;
+    hasMore?: boolean;
+};
 export interface ConditionExpressionPropsType {
     /** 组件的值 */
     value?: conditionExpressionItemType[];
@@ -23,10 +40,11 @@ export interface ConditionExpressionPropsType {
     /** 第一个参数是否展示 */
     showParameter?: boolean;
     /** 第一个参数的options */
-    parameterOptions?: {
-        label: any;
-        value: any;
-    }[];
+    parameterOptions?: ConditionExpressionOptionType[];
+    /** 第一个参数的options远程获取函数 */
+    parameterOptionsRequest?: (params: ConditionExpressionParameterOptionsRequestParams) => Promise<ConditionExpressionParameterOptionsRequestResult>;
+    /** 第一个参数的options远程获取每页条数 */
+    parameterOptionsPageSize?: number;
     /** 第一个参数的Select的labelInValue属性 */
     labelInValue?: boolean;
     /** 是否支持前端筛选 */

package/dist/components/ConditionExpression/index.js

@@ -1,22 +1,30 @@
 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 _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); }); }; }
+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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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); }
 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; }
-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); }
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Input, Select, Tooltip } from 'antd';
-import { cloneDeep } from 'lodash';
-import React from 'react';
+import { Button, Input, Select, Spin, Tooltip } from 'antd';
+import { cloneDeep, debounce } from 'lodash';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import Icon from "../Icon";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var operatorOptions = [{
   label: '=',
@@ -51,6 +59,60 @@ var operatorOptions = [{
 }];
 var tooltipList = ['Between', 'NotBetween', 'In', 'NotIn'];
 var tooltipTitle = '请使用逗号隔开多个参数值，如：1,2';
+var DEFAULT_PARAMETER_OPTIONS_PAGE_SIZE = 20;
+var getOptionKey = function getOptionKey(option) {
+  try {
+    return JSON.stringify(option === null || option === void 0 ? void 0 : option.value);
+  } catch (error) {
+    return String(option === null || option === void 0 ? void 0 : option.value);
+  }
+};
+var mergeOptions = function mergeOptions() {
+  var originOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var appendOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var optionMap = new Map();
+  [].concat(_toConsumableArray(originOptions), _toConsumableArray(appendOptions)).forEach(function (option) {
+    var optionKey = getOptionKey(option);
+    if (!optionMap.has(optionKey)) {
+      optionMap.set(optionKey, option);
+    }
+  });
+  return Array.from(optionMap.values());
+};
+var normalizeParameterOptionsResult = function normalizeParameterOptionsResult(result) {
+  if (Array.isArray(result)) {
+    return {
+      options: result
+    };
+  }
+  return {
+    options: (result === null || result === void 0 ? void 0 : result.options) || [],
+    total: result === null || result === void 0 ? void 0 : result.total,
+    hasMore: result === null || result === void 0 ? void 0 : result.hasMore
+  };
+};
+var createRemoteParameterOptionsState = function createRemoteParameterOptionsState() {
+  return {
+    options: [],
+    loading: false,
+    hasMore: true,
+    page: 0,
+    keyword: '',
+    fetchId: 0
+  };
+};
+var getRemoteParameterOptionsKey = function getRemoteParameterOptionsKey() {
+  var groupIndex = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var conditionIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return "".concat(groupIndex, "-").concat(conditionIndex);
+};
+var getConditionExpressionStructureKey = function getConditionExpressionStructureKey() {
+  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return value.map(function (item) {
+    var _item$conditionItem;
+    return (item === null || item === void 0 || (_item$conditionItem = item.conditionItem) === null || _item$conditionItem === void 0 ? void 0 : _item$conditionItem.length) || 0;
+  }).join('|');
+};
 var ConditionExpressionDefaultValue = [{
   conditionItem: [{
     arguments: null,
@@ -67,9 +129,187 @@ var ConditionExpression = function ConditionExpression(_ref) {
     _ref$showParameter = _ref.showParameter,
     showParameter = _ref$showParameter === void 0 ? true : _ref$showParameter,
     parameterOptions = _ref.parameterOptions,
+    parameterOptionsRequest = _ref.parameterOptionsRequest,
+    _ref$parameterOptions = _ref.parameterOptionsPageSize,
+    parameterOptionsPageSize = _ref$parameterOptions === void 0 ? DEFAULT_PARAMETER_OPTIONS_PAGE_SIZE : _ref$parameterOptions,
     labelInValue = _ref.labelInValue,
     canFrontFilter = _ref.canFrontFilter,
     frontendFilterOptionFun = _ref.frontendFilterOptionFun;
+  var isRemoteParameterOptions = !!parameterOptionsRequest;
+  var conditionExpressionStructureKey = getConditionExpressionStructureKey(value);
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    remoteParameterOptionsMap = _useState2[0],
+    setRemoteParameterOptionsMap = _useState2[1];
+  var remoteParameterOptionsMapRef = useRef({});
+  var remoteParameterOptionsStructureKeyRef = useRef(conditionExpressionStructureKey);
+  var syncRemoteParameterOptionsStructure = useCallback(function () {
+    if (remoteParameterOptionsStructureKeyRef.current === conditionExpressionStructureKey) {
+      return remoteParameterOptionsMapRef.current;
+    }
+    remoteParameterOptionsStructureKeyRef.current = conditionExpressionStructureKey;
+    remoteParameterOptionsMapRef.current = {};
+    setRemoteParameterOptionsMap({});
+    return {};
+  }, [conditionExpressionStructureKey]);
+  useEffect(function () {
+    syncRemoteParameterOptionsStructure();
+  }, [syncRemoteParameterOptionsStructure]);
+  var updateRemoteParameterOptionsState = useCallback(function (remoteKey, updater) {
+    var currentState = remoteParameterOptionsMapRef.current[remoteKey] || createRemoteParameterOptionsState();
+    var nextStateMap = _objectSpread(_objectSpread({}, remoteParameterOptionsMapRef.current), {}, _defineProperty({}, remoteKey, updater(currentState)));
+    remoteParameterOptionsMapRef.current = nextStateMap;
+    setRemoteParameterOptionsMap(nextStateMap);
+  }, []);
+  var loadRemoteParameterOptions = useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+      var page, _ref2$keyword, keyword, reset, force, groupIndex, conditionIndex, remoteKey, remoteParameterOptionsStateMap, currentState, fetchId, result, latestState, _normalizeParameterOp, options, total, hasMore, nextOptions, nextHasMore, _latestState;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            page = _ref2.page, _ref2$keyword = _ref2.keyword, keyword = _ref2$keyword === void 0 ? '' : _ref2$keyword, reset = _ref2.reset, force = _ref2.force, groupIndex = _ref2.groupIndex, conditionIndex = _ref2.conditionIndex;
+            remoteKey = getRemoteParameterOptionsKey(groupIndex, conditionIndex);
+            remoteParameterOptionsStateMap = syncRemoteParameterOptionsStructure();
+            currentState = remoteParameterOptionsStateMap[remoteKey] || createRemoteParameterOptionsState();
+            if (!(!parameterOptionsRequest || currentState.loading && !force)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            fetchId = currentState.fetchId + 1;
+            updateRemoteParameterOptionsState(remoteKey, function (state) {
+              return _objectSpread(_objectSpread({}, state), {}, {
+                loading: true,
+                fetchId: fetchId
+              });
+            });
+            _context.prev = 8;
+            _context.next = 11;
+            return parameterOptionsRequest({
+              page: page,
+              pageSize: parameterOptionsPageSize,
+              keyword: keyword,
+              groupIndex: groupIndex,
+              conditionIndex: conditionIndex
+            });
+          case 11:
+            result = _context.sent;
+            latestState = remoteParameterOptionsMapRef.current[remoteKey] || createRemoteParameterOptionsState();
+            if (!(fetchId !== latestState.fetchId)) {
+              _context.next = 15;
+              break;
+            }
+            return _context.abrupt("return");
+          case 15:
+            _normalizeParameterOp = normalizeParameterOptionsResult(result), options = _normalizeParameterOp.options, total = _normalizeParameterOp.total, hasMore = _normalizeParameterOp.hasMore;
+            nextOptions = reset ? options : mergeOptions(latestState.options, options);
+            nextHasMore = typeof hasMore === 'boolean' ? hasMore : typeof total === 'number' ? nextOptions.length < total : options.length >= parameterOptionsPageSize;
+            updateRemoteParameterOptionsState(remoteKey, function (state) {
+              return _objectSpread(_objectSpread({}, state), {}, {
+                options: nextOptions,
+                page: page,
+                keyword: keyword,
+                hasMore: nextHasMore
+              });
+            });
+            _context.next = 23;
+            break;
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context["catch"](8);
+          case 23:
+            _context.prev = 23;
+            _latestState = remoteParameterOptionsMapRef.current[remoteKey] || createRemoteParameterOptionsState();
+            if (fetchId === _latestState.fetchId) {
+              updateRemoteParameterOptionsState(remoteKey, function (state) {
+                return _objectSpread(_objectSpread({}, state), {}, {
+                  loading: false
+                });
+              });
+            }
+            return _context.finish(23);
+          case 27:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[8, 21, 23, 27]]);
+    }));
+    return function (_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }(), [parameterOptionsPageSize, parameterOptionsRequest, syncRemoteParameterOptionsStructure, updateRemoteParameterOptionsState]);
+  var debounceRemoteSearch = useMemo(function () {
+    return debounce(function (keyword, indexList) {
+      var remoteKey = getRemoteParameterOptionsKey(indexList[0], indexList[1]);
+      updateRemoteParameterOptionsState(remoteKey, function (state) {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          options: [],
+          page: 0,
+          keyword: keyword,
+          hasMore: true
+        });
+      });
+      loadRemoteParameterOptions({
+        page: 1,
+        keyword: keyword,
+        reset: true,
+        force: true,
+        groupIndex: indexList[0],
+        conditionIndex: indexList[1]
+      });
+    }, 500);
+  }, [loadRemoteParameterOptions, updateRemoteParameterOptionsState]);
+  useEffect(function () {
+    return function () {
+      debounceRemoteSearch.cancel();
+    };
+  }, [debounceRemoteSearch]);
+  var handleRemoteOpenChange = function handleRemoteOpenChange(open, indexList) {
+    var remoteKey = getRemoteParameterOptionsKey(indexList[0], indexList[1]);
+    var remoteParameterOptionsStateMap = syncRemoteParameterOptionsStructure();
+    var currentState = remoteParameterOptionsStateMap[remoteKey] || createRemoteParameterOptionsState();
+    if (!open || !isRemoteParameterOptions || currentState.page > 0 || currentState.loading) {
+      return;
+    }
+    loadRemoteParameterOptions({
+      page: 1,
+      keyword: currentState.keyword,
+      reset: true,
+      groupIndex: indexList[0],
+      conditionIndex: indexList[1]
+    });
+  };
+  var handleRemotePopupScroll = function handleRemotePopupScroll(event, indexList) {
+    var remoteKey = getRemoteParameterOptionsKey(indexList[0], indexList[1]);
+    var remoteParameterOptionsStateMap = syncRemoteParameterOptionsStructure();
+    var currentState = remoteParameterOptionsStateMap[remoteKey] || createRemoteParameterOptionsState();
+    if (!isRemoteParameterOptions || currentState.loading || !currentState.hasMore) {
+      return;
+    }
+    var target = event.target;
+    var isBottom = target.scrollTop + target.offsetHeight >= target.scrollHeight - 20;
+    if (!isBottom) {
+      return;
+    }
+    loadRemoteParameterOptions({
+      page: currentState.page + 1,
+      keyword: currentState.keyword,
+      groupIndex: indexList[0],
+      conditionIndex: indexList[1]
+    });
+  };
+  var getRemotePopupRender = function getRemotePopupRender(menu, loading) {
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [menu, loading && /*#__PURE__*/_jsx("div", {
+        className: "condition-select-loading",
+        children: /*#__PURE__*/_jsx(Spin, {
+          size: "small"
+        })
+      })]
+    });
+  };
+
   /** 添加条件触发 */
   var addExpression = function addExpression(index) {
     var _conditionExpressionItem = value.map(function (e, i) {
@@ -113,7 +353,11 @@ var ConditionExpression = function ConditionExpression(_ref) {
   /** 数据变化时调用 */
   var dataChange = function dataChange(type, data, index) {
     var _conditionExpressionItem = cloneDeep(value);
-    type === 'logicOperatorByGroup' ? _conditionExpressionItem[index[0]]['logicOperator'] = data : _conditionExpressionItem[index[0]].conditionItem[index[1]][type] = data;
+    if (type === 'logicOperatorByGroup') {
+      _conditionExpressionItem[index[0]]['logicOperator'] = data;
+    } else {
+      _conditionExpressionItem[index[0]].conditionItem[index[1]][type] = data;
+    }
     onChange === null || onChange === void 0 || onChange(_conditionExpressionItem);
   };
 
@@ -159,10 +403,11 @@ var ConditionExpression = function ConditionExpression(_ref) {
       })
     });
   };
-  var getConditionExpressionItem = function getConditionExpressionItem(item, index, notFirst) {
+  var getConditionExpressionItem = function getConditionExpressionItem(item, index) {
+    var _value$index$5;
     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__*/_jsx("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: "condition-all-content",
         children: /*#__PURE__*/_jsxs("div", {
           className: 'condition-all-undelete',
@@ -173,11 +418,11 @@ var ConditionExpression = function ConditionExpression(_ref) {
               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());
             };
+            var remoteKey = getRemoteParameterOptionsKey(index[0], i);
+            var remoteParameterOptionsState = remoteParameterOptionsMap[remoteKey] || createRemoteParameterOptionsState();
+            var mergedParameterOptions = mergeOptions(parameterOptions || [], remoteParameterOptionsState.options);
             return /*#__PURE__*/_jsxs("div", {
-              style: {
-                display: 'flex',
-                alignItems: 'center'
-              },
+              className: 'condition-item-row',
               children: [/*#__PURE__*/_jsxs("div", {
                 className: 'condition-item',
                 children: [showParameter && /*#__PURE__*/_jsx("div", {
@@ -188,13 +433,29 @@ var ConditionExpression = function ConditionExpression(_ref) {
                     },
                     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,
+                    options: mergedParameterOptions,
                     labelInValue: labelInValue,
                     onSelect: function onSelect(data) {
                       return dataChange('arguments', data, [index[0], i]);
                     },
-                    showSearch: canFrontFilter,
-                    filterOption: canFrontFilter || frontendFilterOptionFun ? frontendFilterOptionFun || frontendFilterOption : true
+                    showSearch: isRemoteParameterOptions || canFrontFilter,
+                    onSearch: isRemoteParameterOptions ? function (keyword) {
+                      return debounceRemoteSearch(keyword, [index[0], i]);
+                    } : undefined,
+                    onOpenChange: isRemoteParameterOptions ? function (open) {
+                      return handleRemoteOpenChange(open, [index[0], i]);
+                    } : undefined,
+                    onPopupScroll: isRemoteParameterOptions ? function (event) {
+                      return handleRemotePopupScroll(event, [index[0], i]);
+                    } : undefined,
+                    loading: remoteParameterOptionsState.loading,
+                    notFoundContent: isRemoteParameterOptions && remoteParameterOptionsState.loading ? /*#__PURE__*/_jsx(Spin, {
+                      size: "small"
+                    }) : null,
+                    popupRender: isRemoteParameterOptions ? function (menu) {
+                      return getRemotePopupRender(menu, remoteParameterOptionsState.loading);
+                    } : undefined,
+                    filterOption: isRemoteParameterOptions ? false : canFrontFilter || frontendFilterOptionFun ? frontendFilterOptionFun || frontendFilterOption : true
                   })
                 }), /*#__PURE__*/_jsx("div", {
                   className: 'condition-select-middle',
@@ -244,7 +505,7 @@ var ConditionExpression = function ConditionExpression(_ref) {
             })
           })]
         })
-      }), value.length > 1 && /*#__PURE__*/_jsx(CloseOutlined, {
+      }), (value === null || value === void 0 || (_value$index$5 = value[index[0]]) === null || _value$index$5 === void 0 ? void 0 : _value$index$5.logicOperator) && conditionLink(value === null || value === void 0 ? void 0 : value[index[0]].logicOperator, 'logicOperatorByGroup', [index[0]]), value.length > 1 && /*#__PURE__*/_jsx(CloseOutlined, {
         className: "condition-del",
         onClick: function onClick() {
           return delOnClick(index);
@@ -255,7 +516,7 @@ var ConditionExpression = function ConditionExpression(_ref) {
   return /*#__PURE__*/_jsxs("div", {
     className: 'condition-expression-item',
     children: [value === null || value === void 0 ? void 0 : value.map(function (e, index) {
-      return getConditionExpressionItem(e.conditionItem, [index], index !== 0);
+      return getConditionExpressionItem(e.conditionItem, [index]);
     }), /*#__PURE__*/_jsx(Button, {
       onClick: addGroup,
       className: 'condition-add-group',

package/dist/components/ConditionExpression/index.less

@@ -23,21 +23,29 @@
     /* 添加相对定位 */
     .condition-all-undelete {
       display: flex;
-      align-items: center;
+      flex-direction: column;
+      align-items: flex-start;
+      gap: 6px;
       position: relative;
       border-radius: 6px;
       padding: 6px 8px 6px 6px;
 
+      .condition-item-row {
+        display: flex;
+        align-items: center;
+        width: 100%;
+      }
+
       .condition-item {
         display: flex;
         align-items: center;
         position: relative;
         padding-right: 8px;
+        flex: 0 0 auto;
 
         .condition-select-left {
           padding-right: 4px;
-          min-width: 120px;
-          max-width: 300px;
+          width: 240px;
         }
 
         .condition-select-middle {
@@ -74,6 +82,10 @@
       }
 
       .condition-add {
+        display: flex;
+        align-items: center;
+        height: 24px;
+
         i {
           font-size: 20px;
           cursor: pointer;
@@ -107,6 +119,17 @@
   }
 
   .condition-link {
+    flex: 0 0 88px;
+    margin-left: 8px;
     padding-right: 8px;
+
+    .ant-select {
+      width: 72px;
+    }
+  }
+
+  .condition-select-loading {
+    padding: 8px 0;
+    text-align: center;
   }
-}
+}

package/dist/components/CustomForm/CustomForm.js

@@ -16,7 +16,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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';
+import { AutoComplete, Badge, Button, Cascader, Checkbox, Col, DatePicker, Form, Input, InputNumber, Radio, Row, Select, Spin, Switch, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash';
 import React, { forwardRef, useEffect, useMemo, useState } from 'react';
@@ -319,6 +319,38 @@ var CustomForm = function CustomForm(_ref, ref) {
           maxTagCount: item.maxTagCount,
           optionFilterProp: item.optionFilterProp || 'value',
           optionLabelProp: item.optionLabelProp || 'children',
+          maxTagPlaceholder: item.maxTagPlaceholder || function (omittedValues) {
+            return /*#__PURE__*/_jsx(Tooltip, {
+              styles: {
+                root: {
+                  pointerEvents: 'none'
+                }
+              },
+              title: omittedValues.map(function (_ref2) {
+                var label = _ref2.label;
+                if (typeof label === 'string' || typeof label === 'number') {
+                  return String(label);
+                } else if ( /*#__PURE__*/React.isValidElement(label)) {
+                  var _element = label;
+                  var props = _element.props;
+
+                  // 尝试提取文本
+                  if ((props === null || props === void 0 ? void 0 : props.text) !== undefined) {
+                    var text = props.text;
+                    if (Array.isArray(text)) {
+                      return text.join(', ');
+                    }
+                    return String(text);
+                  }
+                } else {
+                  return '';
+                }
+              }).join(', '),
+              children: /*#__PURE__*/_jsxs("span", {
+                children: ["+", omittedValues.length, "..."]
+              })
+            });
+          },
           children: (item === null || item === void 0 ? void 0 : item.setting) && Array.isArray(item.setting) && ((_item$setting2 = item.setting) === null || _item$setting2 === void 0 ? void 0 : _item$setting2.map(function (el, num) {
             var _el$options;
             if (el !== null && el !== void 0 && el.options && (el === null || el === void 0 || (_el$options = el.options) === null || _el$options === void 0 ? void 0 : _el$options.length) > 0) {
@@ -579,6 +611,38 @@ var CustomForm = function CustomForm(_ref, ref) {
               style: {
                 width: '100%'
               },
+              maxTagPlaceholder: item.maxTagPlaceholder || function (omittedValues) {
+                return /*#__PURE__*/_jsx(Tooltip, {
+                  styles: {
+                    root: {
+                      pointerEvents: 'none'
+                    }
+                  },
+                  title: omittedValues.map(function (_ref3) {
+                    var label = _ref3.label;
+                    if (typeof label === 'string' || typeof label === 'number') {
+                      return String(label);
+                    } else if ( /*#__PURE__*/React.isValidElement(label)) {
+                      var _element2 = label;
+                      var props = _element2.props;
+
+                      // 尝试提取文本
+                      if ((props === null || props === void 0 ? void 0 : props.text) !== undefined) {
+                        var text = props.text;
+                        if (Array.isArray(text)) {
+                          return text.join(', ');
+                        }
+                        return String(text);
+                      }
+                    } else {
+                      return '';
+                    }
+                  }).join(', '),
+                  children: /*#__PURE__*/_jsxs("span", {
+                    children: ["+", omittedValues.length, "..."]
+                  })
+                });
+              },
               children: (item === null || item === void 0 ? void 0 : item.setting) && Array.isArray(item.setting) && item.setting.map(function (el, num) {
                 return /*#__PURE__*/_jsx(Option, {
                   value: el.value,
@@ -622,6 +686,38 @@ var CustomForm = function CustomForm(_ref, ref) {
               style: {
                 width: '100%'
               },
+              maxTagPlaceholder: item.maxTagPlaceholder || function (omittedValues) {
+                return /*#__PURE__*/_jsx(Tooltip, {
+                  styles: {
+                    root: {
+                      pointerEvents: 'none'
+                    }
+                  },
+                  title: omittedValues.map(function (_ref4) {
+                    var label = _ref4.label;
+                    if (typeof label === 'string' || typeof label === 'number') {
+                      return String(label);
+                    } else if ( /*#__PURE__*/React.isValidElement(label)) {
+                      var _element3 = label;
+                      var props = _element3.props;
+
+                      // 尝试提取文本
+                      if ((props === null || props === void 0 ? void 0 : props.text) !== undefined) {
+                        var text = props.text;
+                        if (Array.isArray(text)) {
+                          return text.join(', ');
+                        }
+                        return String(text);
+                      }
+                    } else {
+                      return '';
+                    }
+                  }).join(', '),
+                  children: /*#__PURE__*/_jsxs("span", {
+                    children: ["+", omittedValues.length, "..."]
+                  })
+                });
+              },
               children: item.setting1.map(function (el, num) {
                 return /*#__PURE__*/_jsx(Option, {
                   value: el.value,
@@ -652,7 +748,12 @@ var CustomForm = function CustomForm(_ref, ref) {
       case CustomFormItemType.ConditionExpression:
         element = /*#__PURE__*/_jsx(ConditionExpression, {
           showParameter: item === null || item === void 0 ? void 0 : item.showParameter,
-          parameterOptions: (item === null || item === void 0 ? void 0 : item.setting) || []
+          parameterOptions: (item === null || item === void 0 ? void 0 : item.setting) || [],
+          labelInValue: item === null || item === void 0 ? void 0 : item.labelInValue,
+          canFrontFilter: item === null || item === void 0 ? void 0 : item.canFrontFilter,
+          frontendFilterOptionFun: item === null || item === void 0 ? void 0 : item.frontendFilterOptionFun,
+          parameterOptionsRequest: item === null || item === void 0 ? void 0 : item.parameterOptionsRequest,
+          parameterOptionsPageSize: item === null || item === void 0 ? void 0 : item.parameterOptionsPageSize
         });
         break;
       case CustomFormItemType.RemoteSelect:

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

@@ -2,6 +2,7 @@ import type { TimePickerProps, TimeRangePickerProps, GetProps } from 'antd';
 import { FormProps, DatePicker } from 'antd';
 import { FormLabelAlign } from 'antd/es/form/interface';
 import { MouseEventHandler, ReactNode } from 'react';
+import type { ConditionExpressionParameterOptionsRequestParams, ConditionExpressionParameterOptionsRequestResult } from '../ConditionExpression';
 type RangePickerProps = GetProps<typeof DatePicker.RangePicker>;
 export interface fieldType {
     field: string;
@@ -86,7 +87,7 @@ export type CustomSearchFieldType = {
     max?: number;
     step?: number;
     precision?: number;
-    showSearch?: boolean | Object;
+    showSearch?: boolean | object;
     handleSearch?: () => void;
     suffix?: string;
     isFilter?: boolean;
@@ -105,6 +106,14 @@ export type CustomSearchFieldType = {
     extra?: ReactNode;
     unit?: string;
     tooltip?: string;
+    /**conditionExpression组件获取参数options函数 */
+    parameterOptionsRequest?: (params: ConditionExpressionParameterOptionsRequestParams) => Promise<ConditionExpressionParameterOptionsRequestResult>;
+    /**conditionExpression组件获取参数options每页条数 */
+    parameterOptionsPageSize?: number;
+    /**conditionExpression组件是否支持前端筛选 */
+    canFrontFilter?: boolean;
+    /**conditionExpression组件前端筛选函数 */
+    frontendFilterOptionFun?: (input: any, option: any) => boolean;
     /**remoteSelect组件获取options函数 */
     getOptionsFn?: (keyword: string) => Promise<any[]>;
     /**自定义节点 label、value、options、groupLabel 的字段 */

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

@@ -20,7 +20,7 @@ import { Tooltip } from 'antd';
 import { useMemo } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { useConfig } from "../../ConfigProvider";
-import { ColumnType } from "../TableMax";
+import { ColumnType } from "../type";
 import { ColumnFilter } from "../components/ColumnFilterV2";
 import Sort from "../components/ColumnSort";
 import "./index.less";

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

@@ -1,13 +1,6 @@
 import React from 'react';
 import './tableMax.less';
 import { type TableMaxProps } from './type';
-export declare enum ColumnType {
-    Selection = "selection-column",
-    Darg = "darg-column",
-    PlaceHolder = "placeholder-column",
-    Expander = "expander",
-    Index = "inner-index"
-}
 export type ColumnSizing = Record<string, number>;
 export declare const CACHE_MAX_AGE: number;
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>>;

package/dist/components/TableMax/TableMax.js

@@ -35,6 +35,7 @@ import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customS
 import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
+import { ColumnType } from "./type";
 import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { useTableScrollShadow } from "./hooks/useTableScrollShadow";
 import { ExportTableData } from "./components/Export";
@@ -42,14 +43,6 @@ import UnifiedTable from "./UnifiedTable";
 import { useHoverDetection } from "./hooks/useHoverDetection";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export var ColumnType = /*#__PURE__*/function (ColumnType) {
-  ColumnType["Selection"] = "selection-column";
-  ColumnType["Darg"] = "darg-column";
-  ColumnType["PlaceHolder"] = "placeholder-column";
-  ColumnType["Expander"] = "expander";
-  ColumnType["Index"] = "inner-index";
-  return ColumnType;
-}({});
 export var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
 var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);

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

@@ -14,7 +14,7 @@ import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 're
 import { useDrag, useDrop } from 'react-dnd';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../../ConfigProvider";
-import { ColumnType } from "../../index";
+import { ColumnType } from "../../type";
 import "./index.less";
 import { useTranslation } from "../../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";

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

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

package/dist/components/TableMax/components/Export/useTableExport.js

@@ -16,14 +16,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import { useCallback, useState, useRef } from 'react';
 import * as XLSX from 'xlsx';
 import { message } from 'antd';
-var ColumnType = /*#__PURE__*/function (ColumnType) {
-  ColumnType["Selection"] = "selection-column";
-  ColumnType["Drag"] = "darg-column";
-  ColumnType["PlaceHolder"] = "placeholder-column";
-  ColumnType["Expander"] = "expander";
-  ColumnType["Index"] = "inner-index";
-  return ColumnType;
-}(ColumnType || {});
+import { ColumnType } from "../../type";
 var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, originalRow, column) {
   var cell = column.cell,
     accessorKey = column.accessorKey,
@@ -65,7 +58,7 @@ var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, orig
   }
   return value !== null && value !== void 0 ? value : '';
 };
-var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Drag, ColumnType.PlaceHolder, ColumnType.Expander, ColumnType.Index];
+var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Darg, ColumnType.PlaceHolder, ColumnType.Expander, ColumnType.Index];
 function fetchWithRetry(_x) {
   return _fetchWithRetry.apply(this, arguments);
 }

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

@@ -1,5 +1,5 @@
 import TableMax from './TableMax';
-export { ColumnType } from './TableMax';
+export { ColumnType } from './type';
 export { InputType } from './components/ColumnEdit';
 export { FilterType } from './components/ColumnFilterV2';
 export type { FilterFnType } from './components/ColumnFilterV2';

package/dist/components/TableMax/index.js

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

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

@@ -5,6 +5,13 @@ import { InputType } from './components/ColumnEdit';
 import { FilterFnType, FilterType } from './components/ColumnFilterV2';
 import { SortFnType } from './components/ColumnSort/customSortFns';
 import { ExportOptions } from './components/Export';
+export declare enum ColumnType {
+    Selection = "selection-column",
+    Darg = "darg-column",
+    PlaceHolder = "placeholder-column",
+    Expander = "expander",
+    Index = "inner-index"
+}
 export type PrefixClsType = 'custom-light' | 'custom-dark';
 export declare enum DropSide {
     Top = "top",

package/dist/components/TableMax/type.js

@@ -1,3 +1,11 @@
+export var ColumnType = /*#__PURE__*/function (ColumnType) {
+  ColumnType["Selection"] = "selection-column";
+  ColumnType["Darg"] = "darg-column";
+  ColumnType["PlaceHolder"] = "placeholder-column";
+  ColumnType["Expander"] = "expander";
+  ColumnType["Index"] = "inner-index";
+  return ColumnType;
+}({});
 export var DropSide = /*#__PURE__*/function (DropSide) {
   DropSide["Top"] = "top";
   DropSide["Bottom"] = "bottom";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.96",
+  "version": "2.3.98",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
     "@ant-design/pro-components": "^2.7.10",
-    "@arim-aisdc/public-components": "^2.3.90",
+    "@arim-aisdc/public-components": "^2.3.96",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.9.1",
     "@tanstack/react-virtual": "^3.13.12",