bkui-vue 0.0.3-beta.2-3 → 0.0.3-beta.2-4

package/dist/index.esm.js

@@ -11501,6 +11501,13 @@ const OI = {
    * 是否显示Head
    */
   showHead: g.bool.def(!0),
+  /**
+   * 排序时对需要排序的字符串数值进行格式化
+   * 这里需要配置为正则或者回调函数，(str) => string | number | boolean
+   * 如果配置为正则，程序会提取匹配到的第一个结果尝试转换为数值
+   * 如果为多个，程序会顺序执行所有正则表达式，直到转换成功
+   */
+  sortValFormat: g.arrayOf(g.any).def([""]),
   /**
    * table header config
    */
@@ -12515,7 +12522,14 @@ const mt = (e, t, n) => {
     isShow: t,
     height: n
   }, a);
-}, ll = (e, t) => typeof e == "string" || typeof e == "number" || typeof e == "boolean" ? e : pr(e, t), cN = (e, t) => pr(e, t), ki = (e, t) => Array.isArray(e) ? e : typeof e == "string" || typeof e == "object" ? [e] : typeof e == "function" ? ki(Reflect.apply(e, globalThis, t), t) : [], uN = (e, t, n) => {
+}, ll = (e, t, n) => {
+  let a;
+  (typeof e == "string" || typeof e == "number" || typeof e == "boolean") && (a = e);
+  const i = (s, l = "ig") => new RegExp(`${s}`.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), l);
+  return a = pr(e, t), n != null && n.length && (n.forEach((s) => {
+    typeof s == "function" ? a = s(a, e, t) : a = a.match(typeof s == "string" ? i(s) : s)[1] ?? a;
+  }), /^-?\d+.?\d*$/.test(a) && (a = Number(a))), a;
+}, cN = (e, t) => pr(e, t), ki = (e, t) => Array.isArray(e) ? e : typeof e == "string" || typeof e == "object" ? [e] : typeof e == "function" ? ki(Reflect.apply(e, globalThis, t), t) : [], uN = (e, t, n) => {
   const a = k9(e, t, n);
   return a !== null ? a : Sn();
 }, k9 = (e, t, n) => typeof t.rowKey == "string" ? t.rowKey === Pe.ROW_INDEX ? `__ROW_INDEX_${n}` : pr(e, t.rowKey) : typeof t.rowKey == "function" ? Reflect.apply(t.rowKey, globalThis, [e]) : null, dN = (e, t, n = 0) => {
@@ -12539,13 +12553,13 @@ const mt = (e, t, n) => {
     colspan: i,
     rowspan: s
   };
-}, nu = (e, t) => {
-  var l, r;
-  const n = e.field, a = (c) => ll(c, n), i = (c, o) => {
-    const d = a(c) ?? "", f = a(o) ?? "";
-    return typeof d == "number" && typeof f == "number" ? d - f : String.prototype.localeCompare.call(d, f);
-  }, s = typeof ((l = e.sort) == null ? void 0 : l.sortFn) == "function" ? (r = e.sort) == null ? void 0 : r.sortFn : i;
-  return t === et.NULL ? (c, o) => !0 : (c, o) => s(c, o) * (t === et.DESC ? -1 : 1);
+}, nu = (e, t, n = []) => {
+  var r, c;
+  const a = e.field, i = (o) => ll(o, a, n), s = (o, d) => {
+    const f = i(o) ?? "", h = i(d) ?? "";
+    return typeof f == "number" && typeof h == "number" ? f - h : String.prototype.localeCompare.call(f, h);
+  }, l = typeof ((r = e.sort) == null ? void 0 : r.sortFn) == "function" ? (c = e.sort) == null ? void 0 : c.sortFn : s;
+  return t === et.NULL ? (o, d) => !0 : (o, d) => l(o, d) * (t === et.DESC ? -1 : 1);
 }, x9 = (e) => {
   const t = {
     [et.NULL]: 3,
@@ -12553,7 +12567,7 @@ const mt = (e, t, n) => {
     [et.DESC]: 2
   };
   return t[e] === void 0 ? et.ASC : Object.keys(t)[(t[e] + 1) % 3];
-}, D9 = (e, t) => typeof e == "string" ? {
+}, D9 = (e, t, n = []) => typeof e == "string" ? {
   value: e
 } : typeof e == "boolean" && e ? {
   value: et.NULL
@@ -12561,7 +12575,7 @@ const mt = (e, t, n) => {
   value: "custom",
   ...e
 } : Object.assign({}, {
-  sortFn: nu(t, e.value ?? et.NULL)
+  sortFn: nu(t, e.value ?? et.NULL, n)
 }, e) : null, ol = (e, {
   row: t,
   index: n,
@@ -13952,7 +13966,8 @@ const SN = /* @__PURE__ */ ue({
   props: {
     column: fs,
     defaultSort: g.oneOf(LI).def(et.NULL),
-    active: g.bool
+    active: g.bool,
+    sortValFormat: g.arrayOf(g.any).def([""])
   },
   emits: ["change"],
   setup(e, {
@@ -13972,7 +13987,7 @@ const SN = /* @__PURE__ */ ue({
       d.stopImmediatePropagation(), d.stopPropagation(), d.preventDefault();
       let h = f;
       f === et.NULL && (h = x9(f)), s.value === f && (h = et.NULL);
-      const m = nu(e.column, h), v = D9(e.column.sort, e.column);
+      const m = nu(e.column, h, e.sortValFormat), v = D9(e.column.sort, e.column, e.sortValFormat);
       if ((v == null ? void 0 : v.value) === "custom") {
         t("change", (v == null ? void 0 : v.sortFn) ?? m, h);
         return;
@@ -14016,7 +14031,7 @@ const DN = (e, t, n, a) => {
     if (!a.getColumnAttribute(y, Me.COL_IS_DRAG) && y.sort && !y.filter) {
       const M = a.getColumnAttribute(y, Me.COL_SORT_TYPE);
       i.value = x9(M);
-      const I = (S, N) => r(y, nu(y, i.value), S, N);
+      const I = (S, N) => r(y, nu(y, i.value, e.sortValFormat), S, N);
       a.setColumnAttribute(y, Me.COL_SORT_TYPE, i.value), a.setColumnAttribute(y, Me.COL_SORT_FN, I), a.setColumnSortActive(y, !0), a.sortData(y), t.emit(Ye.COLUMN_SORT, {
         column: Ji(y),
         index: p,