@aplus-frontend/ui 6.13.4 → 6.14.0

package/es/src/ap-grid/hooks/use-row-selection.d.ts

@@ -1,7 +1,8 @@
 import { TableRowSelection } from '@aplus-frontend/antdv/lib/table/interface';
 import { ComputedRef, Ref } from 'vue';
-import { ApTableProps, ApTableRowSelection } from '../../ap-table';
+import { ApTableProps } from '../../ap-table';
 import { Recordable } from '../../type';
+import { ApGridRowSelection } from '../interface';
 export interface RowSelectionReturnType<RecordType = any> {
     rowSelection: ComputedRef<TableRowSelection<RecordType>>;
     selectedRows: Ref<Partial<RecordType>[]>;
@@ -58,12 +59,12 @@ export interface RowSelectionReturnType<RecordType = any> {
     unSelectMulti: (items: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-change事件
-     * @param item
      * @param select
-     * @param partRowData
+     * @param selectedRows
+     * @param reserveSelectedRows
      * @returns
      */
-    selectChange: (item: RecordType, select: boolean, partRowData: RecordType[]) => void;
+    selectChange: (select: boolean, selectedRows: RecordType[], reserveSelectedRows: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-all事件
      * @param item
@@ -86,7 +87,7 @@ export interface RowSelectionReturnType<RecordType = any> {
      */
     selectMultiByKeys: (keys: (string | number)[]) => void;
 }
-type RowSelectionParams<T> = Omit<ApTableRowSelection<T>, 'mode'> & {
+type RowSelectionParams<T> = ApGridRowSelection<T> & {
     /**
      * 数据源（如果是后端分页，则表示当页数据，否则是全量数据）
      */

package/es/src/ap-grid/hooks/use-row-selection.mjs

@@ -1,117 +1,132 @@
-import { ref as I, computed as v, unref as o } from "vue";
-import { isFunction as i, cloneDeep as _ } from "lodash-unified";
-function b(a, c) {
-  return !(c != null && c.length) || i(a) ? [] : c.map((f) => ({ [a]: f }));
+import { ref as F, computed as M, unref as o } from "vue";
+import { isFunction as v, cloneDeep as h } from "lodash-unified";
+function T(a, c) {
+  return !(c != null && c.length) || v(a) ? [] : c.map((d) => ({ [a]: d }));
 }
-const F = (a) => {
-  a.defaultSelectedRowKeys;
-  const c = I(
-    b(a.rowKey, a.defaultSelectedRowKeys)
+const m = (a) => {
+  const c = F(
+    T(a.rowKey, a.defaultSelectedRowKeys)
   );
-  function f(e, t) {
+  function d(e, t) {
     c.value = t;
   }
-  const l = (e) => i(a.rowKey) ? a.rowKey(e) : e[a.rowKey], s = v(() => {
+  const u = (e) => v(a.rowKey) ? a.rowKey(e) : e[a.rowKey], s = M(() => {
     const e = /* @__PURE__ */ new Map();
     return o(c).forEach((t) => {
-      e.set(l(t), t);
+      e.set(u(t), t);
     }), e;
   });
-  function M(e) {
-    return o(s).has(l(e));
+  function w(e) {
+    return o(s).has(u(e));
   }
   function g(e) {
+    if (!f(e))
+      return;
     const t = o(s);
-    t.set(l(e), e), c.value = [...t.values()];
+    t.set(u(e), e), c.value = [...t.values()];
   }
-  function h(e) {
+  function x(e) {
     const t = o(s);
     for (const n of e)
-      t.set(l(n), n);
+      f(n) && t.set(u(n), n);
     c.value = [...t.values()];
   }
-  function w(e) {
-    if (i(a.rowKey))
+  function y(e) {
+    if (v(a.rowKey))
       return;
     const t = o(s);
     for (const n of e) {
-      const u = o(a.dataSource).find(
-        (r) => l(r) === n
-      ), S = { [a.rowKey]: n };
-      t.set(String(n), u || S);
+      const l = o(a.dataSource).find(
+        (i) => u(i) === n
+      ), r = { [a.rowKey]: n };
+      f(l || r) && t.set(n, l || r);
     }
     c.value = [...t.values()];
   }
-  function x(e) {
+  function E(e) {
+    if (!f(e))
+      return;
     const t = o(s);
-    t.delete(l(e)), c.value = [...t.values()];
+    t.delete(u(e)), c.value = [...t.values()];
   }
-  function y(e) {
+  function K(e) {
     const t = o(s);
     for (const n of e)
-      t.delete(l(n));
+      f(n) && t.delete(u(n));
     c.value = [...t.values()];
   }
-  function d(e, t) {
+  function S(e, t) {
     const n = e;
-    for (const u of t)
-      n.set(l(u), u);
+    for (const l of t)
+      n.set(u(l), l);
     return n;
   }
-  function K(e, t, n) {
-    const u = o(s);
-    t ? u.set(l(e), e) : u.delete(l(e)), d(u, n), c.value = [...u.values()];
+  function b(e, t, n) {
+    const l = o(s);
+    e ? S(l, [...n, ...t]) : o(a.dataSource).forEach((r) => {
+      const i = u(r);
+      t.some((B) => u(B) === i) ? l.set(i, r) : l.delete(i);
+    }), c.value = [...l.values()];
   }
   function A(e, t) {
-    c.value = [...t];
+    const n = h(o(s));
+    e ? S(n, t) : o(a.dataSource).forEach((l) => {
+      f(l) && n.delete(u(l));
+    }), c.value = [...n.values()];
+  }
+  function f(e) {
+    const t = a.shown, n = a.disabled, l = t ? t(e) : !0, r = n ? n(e) : !1;
+    return l && !r;
   }
   function C(e, t) {
-    const n = _(o(s));
-    o(a.dataSource).forEach((u) => {
-      e.find((r) => l(r) === l(u)) ? n.set(l(u), u) : n.delete(l(u));
-    }), d(n, t), c.value = [...n.values()];
+    const n = h(o(s));
+    o(a.dataSource).forEach((l) => {
+      e.find((i) => u(i) === u(l)) ? n.set(u(l), l) : n.delete(u(l));
+    }), S(n, t), c.value = [...n.values()];
   }
-  function E() {
+  function D() {
     const e = o(s);
     o(a.dataSource).forEach((t) => {
-      e.set(l(t), t);
+      f(t) && e.set(u(t), t);
     }), c.value = [...e.values()];
   }
   function R(e) {
-    const t = o(s), n = l(e);
+    if (!f(e))
+      return;
+    const t = o(s), n = u(e);
     t.has(n) ? t.delete(n) : t.set(n, e), c.value = [...t.values()];
   }
-  function D() {
+  function I() {
     const e = o(s);
     o(a.dataSource).forEach((t) => {
-      e.delete(l(t));
+      f(t) && e.delete(u(t));
     }), c.value = [...e.values()];
   }
-  function m() {
+  function k() {
     c.value = [];
   }
   return {
     select: g,
-    unSelect: x,
-    isSelected: M,
-    selectAll: E,
-    unSelectAll: D,
-    clearAll: m,
+    unSelect: E,
+    isSelected: w,
+    selectAll: D,
+    unSelectAll: I,
+    clearAll: k,
     toggleSelect: R,
     selectedRows: c,
-    selectMulti: h,
-    unSelectMulti: y,
-    rowSelection: v(() => ({
+    selectMulti: x,
+    unSelectMulti: K,
+    rowSelection: M(() => ({
       ...a,
-      onChange: f,
-      selectedRowKeys: o(c).map((e) => l(e))
+      onChange: d,
+      selectedRowKeys: o(c).map((e) => u(e))
     })),
-    selectChange: K,
+    selectChange: b,
     selectAllChange: A,
     selectRangeChange: C,
-    selectMultiByKeys: w
+    selectMultiByKeys: y
   };
 };
 export {
-  F as default
+  m as default
 };

package/es/src/ap-grid/index.vue.mjs

@@ -252,17 +252,14 @@ const Gt = /* @__PURE__ */ $e({
       dataSource: Pe,
       rowKey: o.rowKey
     }), Te = ({
-      checked: e,
-      row: t
+      checked: e
     }) => {
-      const l = s.value;
-      if (l && l) {
-        const r = [
-          ...l.getCheckboxReserveRecords(),
-          ...l.getCheckboxRecords()
-        ];
-        y.selectChange(t, e, r);
-      }
+      const t = s.value;
+      t && t && y.selectChange(
+        e,
+        t.getCheckboxRecords(),
+        t.getCheckboxReserveRecords()
+      );
     }, Ne = ({
       checked: e
     }) => {

package/es/src/business/ap-export-group/convertExportField.d.ts

@@ -1,4 +1,6 @@
+import { ApColumnType } from '../../ap-table/interface';
+import { ApGridColumnType } from './../../ap-grid/interface';
 import { ColumnType } from '@aplus-frontend/antdv/es/table';
-export declare const convertExportField: (columns: ColumnType[], convertField?: {
+export declare const convertExportField: (columns: ColumnType[] | ApGridColumnType[] | ApColumnType[], convertField?: {
     [key: string]: string[];
 }) => any[];

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.13.4";
+declare const _default: "6.14.0";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.13.4";
+const e = "6.14.0";
 export {
   e as default
 };

package/lib/src/ap-grid/hooks/use-row-selection.d.ts

@@ -1,7 +1,8 @@
 import { TableRowSelection } from '@aplus-frontend/antdv/lib/table/interface';
 import { ComputedRef, Ref } from 'vue';
-import { ApTableProps, ApTableRowSelection } from '../../ap-table';
+import { ApTableProps } from '../../ap-table';
 import { Recordable } from '../../type';
+import { ApGridRowSelection } from '../interface';
 export interface RowSelectionReturnType<RecordType = any> {
     rowSelection: ComputedRef<TableRowSelection<RecordType>>;
     selectedRows: Ref<Partial<RecordType>[]>;
@@ -58,12 +59,12 @@ export interface RowSelectionReturnType<RecordType = any> {
     unSelectMulti: (items: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-change事件
-     * @param item
      * @param select
-     * @param partRowData
+     * @param selectedRows
+     * @param reserveSelectedRows
      * @returns
      */
-    selectChange: (item: RecordType, select: boolean, partRowData: RecordType[]) => void;
+    selectChange: (select: boolean, selectedRows: RecordType[], reserveSelectedRows: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-all事件
      * @param item
@@ -86,7 +87,7 @@ export interface RowSelectionReturnType<RecordType = any> {
      */
     selectMultiByKeys: (keys: (string | number)[]) => void;
 }
-type RowSelectionParams<T> = Omit<ApTableRowSelection<T>, 'mode'> & {
+type RowSelectionParams<T> = ApGridRowSelection<T> & {
     /**
      * 数据源（如果是后端分页，则表示当页数据，否则是全量数据）
      */

package/lib/src/ap-grid/hooks/use-row-selection.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("vue"),r=require("lodash-unified");function b(o,c){return!(c!=null&&c.length)||r.isFunction(o)?[]:c.map(f=>({[o]:f}))}const D=o=>{o.defaultSelectedRowKeys;const c=u.ref(b(o.rowKey,o.defaultSelectedRowKeys));function f(e,t){c.value=t}const l=e=>r.isFunction(o.rowKey)?o.rowKey(e):e[o.rowKey],s=u.computed(()=>{const e=new Map;return u.unref(c).forEach(t=>{e.set(l(t),t)}),e});function v(e){return u.unref(s).has(l(e))}function M(e){const t=u.unref(s);t.set(l(e),e),c.value=[...t.values()]}function g(e){const t=u.unref(s);for(const n of e)t.set(l(n),n);c.value=[...t.values()]}function h(e){if(r.isFunction(o.rowKey))return;const t=u.unref(s);for(const n of e){const a=u.unref(o.dataSource).find(i=>l(i)===n),S={[o.rowKey]:n};t.set(String(n),a||S)}c.value=[...t.values()]}function w(e){const t=u.unref(s);t.delete(l(e)),c.value=[...t.values()]}function x(e){const t=u.unref(s);for(const n of e)t.delete(l(n));c.value=[...t.values()]}function d(e,t){const n=e;for(const a of t)n.set(l(a),a);return n}function y(e,t,n){const a=u.unref(s);t?a.set(l(e),e):a.delete(l(e)),d(a,n),c.value=[...a.values()]}function K(e,t){c.value=[...t]}function A(e,t){const n=r.cloneDeep(u.unref(s));u.unref(o.dataSource).forEach(a=>{e.find(i=>l(i)===l(a))?n.set(l(a),a):n.delete(l(a))}),d(n,t),c.value=[...n.values()]}function C(){const e=u.unref(s);u.unref(o.dataSource).forEach(t=>{e.set(l(t),t)}),c.value=[...e.values()]}function E(e){const t=u.unref(s),n=l(e);t.has(n)?t.delete(n):t.set(n,e),c.value=[...t.values()]}function R(){const e=u.unref(s);u.unref(o.dataSource).forEach(t=>{e.delete(l(t))}),c.value=[...e.values()]}function _(){c.value=[]}return{select:M,unSelect:w,isSelected:v,selectAll:C,unSelectAll:R,clearAll:_,toggleSelect:E,selectedRows:c,selectMulti:g,unSelectMulti:x,rowSelection:u.computed(()=>({...o,onChange:f,selectedRowKeys:u.unref(c).map(e=>l(e))})),selectChange:y,selectAllChange:K,selectRangeChange:A,selectMultiByKeys:h}};exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const c=require("vue"),d=require("lodash-unified");function _(o,u){return!(u!=null&&u.length)||d.isFunction(o)?[]:u.map(S=>({[o]:S}))}const q=o=>{const u=c.ref(_(o.rowKey,o.defaultSelectedRowKeys));function S(e,n){u.value=n}const a=e=>d.isFunction(o.rowKey)?o.rowKey(e):e[o.rowKey],s=c.computed(()=>{const e=new Map;return c.unref(u).forEach(n=>{e.set(a(n),n)}),e});function M(e){return c.unref(s).has(a(e))}function h(e){if(!r(e))return;const n=c.unref(s);n.set(a(e),e),u.value=[...n.values()]}function g(e){const n=c.unref(s);for(const t of e)r(t)&&n.set(a(t),t);u.value=[...n.values()]}function w(e){if(d.isFunction(o.rowKey))return;const n=c.unref(s);for(const t of e){const l=c.unref(o.dataSource).find(i=>a(i)===t),f={[o.rowKey]:t};r(l||f)&&n.set(t,l||f)}u.value=[...n.values()]}function x(e){if(!r(e))return;const n=c.unref(s);n.delete(a(e)),u.value=[...n.values()]}function y(e){const n=c.unref(s);for(const t of e)r(t)&&n.delete(a(t));u.value=[...n.values()]}function v(e,n){const t=e;for(const l of n)t.set(a(l),l);return t}function b(e,n,t){const l=c.unref(s);e?v(l,[...t,...n]):c.unref(o.dataSource).forEach(f=>{const i=a(f);n.some(R=>a(R)===i)?l.set(i,f):l.delete(i)}),u.value=[...l.values()]}function E(e,n){const t=d.cloneDeep(c.unref(s));e?v(t,n):c.unref(o.dataSource).forEach(l=>{r(l)&&t.delete(a(l))}),u.value=[...t.values()]}function r(e){const n=o.shown,t=o.disabled,l=n?n(e):!0,f=t?t(e):!1;return l&&!f}function K(e,n){const t=d.cloneDeep(c.unref(s));c.unref(o.dataSource).forEach(l=>{e.find(i=>a(i)===a(l))?t.set(a(l),l):t.delete(a(l))}),v(t,n),u.value=[...t.values()]}function D(){const e=c.unref(s);c.unref(o.dataSource).forEach(n=>{r(n)&&e.set(a(n),n)}),u.value=[...e.values()]}function A(e){if(!r(e))return;const n=c.unref(s),t=a(e);n.has(t)?n.delete(t):n.set(t,e),u.value=[...n.values()]}function C(){const e=c.unref(s);c.unref(o.dataSource).forEach(n=>{r(n)&&e.delete(a(n))}),u.value=[...e.values()]}function F(){u.value=[]}return{select:h,unSelect:x,isSelected:M,selectAll:D,unSelectAll:C,clearAll:F,toggleSelect:A,selectedRows:u,selectMulti:g,unSelectMulti:y,rowSelection:c.computed(()=>({...o,onChange:S,selectedRowKeys:c.unref(u).map(e=>a(e))})),selectChange:b,selectAllChange:E,selectRangeChange:K,selectMultiByKeys:w}};exports.default=q;

package/lib/src/ap-grid/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),v=require("vxe-table");require("vxe-table/es/style.css");const i=require("lodash-unified"),be=require("../ap-form/index.js");require("../config-provider/index.js");const Re=require("../ap-table/constants.js"),p=require("../ap-table/utils.js"),xe=require("../ap-table/hooks/use-table-paging-ng.js"),b=require("@aplus-frontend/antdv"),ke=require("./hooks/use-inner-params.js"),F=require("./utils/table.js"),Be=require("./hooks/use-row-selection.js"),Fe=require("../ap-table/context.js"),E=require("./constants.js"),Ee=require("./hooks/use-render-columns.js"),Ie=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ne=require("../utils/index.js"),Pe=require("../utils/slot.js"),Ve=require("./hooks/use-table-style.js"),qe=require("../config-provider/hooks/use-namespace.js"),ze=require("../config-provider/hooks/use-global-config.js"),Te=require("../config-provider/hooks/use-locale.js"),_e=require("../scroll-bar/index.vue.js"),Ae=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},tableLayout:{},title:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},loading:{type:Boolean,default:void 0},loadingConfig:{},headerCellConfig:{},footerCellConfig:{},round:{type:Boolean,default:void 0},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{},rowHighlightable:{type:[Boolean,Function],default:!1},treeConfig:{}},setup(M,{expose:W}){var U;const g=e.useSlots(),o=M,y=(U=e.getCurrentInstance())==null?void 0:U.appContext.app;y&&!y.__VXE_PC_UI_INSTALLED__&&(y.use(v.VxeUI),y.__VXE_PC_UI_INSTALLED__=!0);const{e:S,b:u,be:j}=qe.useNamespace("ap-grid"),H=ze.useGlobalConfig("valueTypeMap"),s=e.ref([]),I=e.ref([]),l=e.ref(),w=e.ref(o.size),G=Ve.useTableStyle(),[,X]=Ie.useToken(),{t:J}=Te.useLocale();v.VxeUI.setConfig({i18n:(t,r)=>J(`ap.${t}`,r)});const{renderConfig:Q,updateSignal:Y}=Ee.useRenderColumns(s);let N=0;const Z=e.computed(()=>{if(l.value)return l.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),P=e.computed(()=>{var t,r,n;return N++,((n=(r=(t=o.columns)==null?void 0:t.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!Re.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:r.sort((a,c)=>{let h=p.getColumnOrder(a.order);return p.getColumnOrder(c.order)-h}))==null?void 0:n.map(a=>{const c=p.updateFormProps(a,p.getFieldProps(a.fieldProps,{})),h={...a,fieldProps:{label:a.title,name:a.dataIndex,bordered:!0,...c||{},_signal:N},renderNode:void 0};return h.renderNode=p.getSearchFormItemRenderNode(h,e.unref(H)),h}))||[]}),ee=e.computed(()=>{var r;return Ne.isDef(o.manual)?o.manual:Pe.getValidVNodeList(((r=g.searchFormExtra)==null?void 0:r.call(g))||[]).some(n=>{var a;return((a=n.type)==null?void 0:a.name)==="ApView"})}),te=e.computed(()=>[u(),o.card?null:u("wrapper"),o.adaptive?u("adaptive"):null,o.sticky?u("sticky"):null].filter(Boolean)),V=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.sorter===!0)return t.key||t.dataIndex}).filter(Boolean)),q=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.filters&&!t.onFilter)return t.key||t.dataIndex}).filter(Boolean)),{formRef:m,submit:R,reset:x,refresh:z,data:d,tableProps:T,setDataSource:re,handleTableChangeOptional:oe,getPaging:ae,setPaging:ne,submitWith:_}=xe.useTablePaging({async request(t){var n;if(!f.value.preserveSelectedRowKeys&&i.isUndefined(o.dataSource)&&B(),!i.isUndefined(o.dataSource)){const a=t.pageSize*(t.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+t.pageSize))||[],total:o.dataSource.length||0}}const r=await((n=o.request)==null?void 0:n.call(o,t));return{data:(r==null?void 0:r.data)||[],total:(r==null?void 0:r.total)||0}},namespace:"ap-grid",filterFields:q,sortFields:V,params:e.toRef(o,"params"),defaultData:o.defaultData,manual:e.unref(ee),formatParams:o.beforeSearchSubmit,pagination:o.pagination,onClickReset:Se,onAfterRequest:$}),{sortChangeEvent:le,filterChangeEvent:se,paginationChangeEvent:ue}=ke.useInnerParams(oe);Fe.useProvideApTable({columns:e.computed(()=>s.value),columnsBackup:e.computed(()=>I.value),size:e.computed(()=>E.sizeMap[w.value]),updateColumns(t){var r;s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t)},updateSize(t){w.value=E.sizeReverseMap[t]},renderConfig:e.computed(()=>({className:j("table-header","title"),color:X.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(d).records),getSearchFormValues:L,setSearchFormValues:A,submit:R,submitWith:_,reset:x,refresh:z,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O});const ce=e.computed(()=>s.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),ie=e.computed(()=>i.isUndefined(o.loading)?d.loading:o.loading),de=e.computed(()=>i.isUndefined(o.dataSource)?d.records:o.dataSource),{selectedRows:k,rowSelection:f,...C}=Be.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:de,rowKey:o.rowKey}),fe=({checked:t,row:r})=>{const n=l.value;if(n&&n){const a=[...n.getCheckboxReserveRecords(),...n.getCheckboxRecords()];C.selectChange(r,t,a)}},pe=({checked:t})=>{const r=l.value;r&&C.selectAllChange(t,[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},me=()=>{const t=l.value;t&&C.selectRangeChange(t.getCheckboxRecords(),[...t.getCheckboxReserveRecords(),...t.getCheckboxRecords()])},ge=()=>{const t=l.value;t&&(k.value=[t.getRadioRecord()])},Ce=({row:t})=>{const r=o.rowHighlightable;i.isFunction(r)&&r(t)};function he(){var t;return((t=o.columns)==null?void 0:t.filter(r=>!r.hideInTable))||[]}function A(t){var r,n,a;(a=(n=(r=m.value)==null?void 0:r.apForm)==null?void 0:n.setFieldsValue)==null||a.call(n,t)}function L(t=!1){var n,a,c;const r=t?"getFieldsValueTransformed":"getFieldsValue";return(c=(a=(n=m.value)==null?void 0:n.apForm)==null?void 0:a[r])==null?void 0:c.call(a,!0)}function K(){var t;return((t=m.value)==null?void 0:t.getSorterItems())||[]}function D(t){var r;(r=m.value)==null||r.setSorterItems(t)}function O(){var t;(t=m.value)==null||t.resetSorterItems()}function B(){C.clearAll();const t=l.value;t&&(f.value.type==="radio"?(t.clearRadioRow(),t.clearRadioReserve()):(t.clearCheckboxRow(),t.clearCheckboxReserve()))}function ve(t){i.isFunction(o.rowKey)||(C.selectMultiByKeys(t),$())}function ye(t){const r=l.value;if(!r)return;const n=String(t[o.rowKey]),a=r.getRowById(n);r.setCurrentRow(a)}function Se(){const t=l.value;t&&(t.clearSort(),t.clearFilter())}function $(){e.nextTick(()=>{var t,r;f.value.type==="radio"?(t=l.value)==null||t.setRadioRowKey(f.value.selectedRowKeys[0]):(r=l.value)==null||r.setCheckboxRowKey(f.value.selectedRowKeys,!0)})}async function we(t,r){var a;const n=d.records[t];if(n)return(a=l.value)==null?void 0:a.scrollToRow(n,r)}return e.watch(()=>[o.columnResizable,o.columns],()=>{var r;const t=he();s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t),I.value=t},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,t=>{re(t)},{immediate:!0,deep:!0}),e.watch(()=>e.unref(d).loading,t=>{var r;(r=o.onLoadingChange)==null||r.call(o,t)}),e.watch(()=>o.size,t=>{w.value=t}),W({submit:R,reset:x,refresh:z,submitWith:_,setSearchFormValues:A,getSearchFormValues:L,getShowColumns:()=>e.unref(s),rowSelection:{selectedRows:e.computed(()=>k.value),setSelectedRowKeys:ve,clearAll:B},scrollToRow:we,getDataSource:()=>e.unref(d.records),setCurrentRow:ye,getPaging:ae,setPaging:ne,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(te.value),style:e.normalizeStyle(t.wrapperStyle)},[e.unref(i.isUndefined)(t.dataSource)&&t.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(S)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(be.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(T).loading,onSubmit:e.unref(R),onReset:e.unref(x)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(S)("table-wrapper"),t.card?e.unref(S)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("header-wrapper"))},[e.renderSlot(t.$slots,"title",{selectedRows:e.unref(k),selectedRowKeys:e.unref(f).selectedRowKeys,shownColumns:s.value,clearAll:B})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(v.VxeTable),e.mergeProps(e.unref(F.toVxeProps)(o),{ref_key:"tableRef",ref:l,key:e.unref(Y),data:e.unref(d).records,"sort-config":{remote:V.value.length>0,trigger:"cell"},"filter-config":{remote:q.value.length>0},loading:ie.value,style:e.unref(G),size:w.value,onSortChange:e.unref(le),onFilterChange:e.unref(se),onCheckboxChange:fe,onCheckboxRangeChange:me,onCheckboxAll:pe,onRadioChange:ge,onCurrentChange:Ce}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(b.Empty),{image:e.unref(b.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),loading:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(S)("table-loading-wrapper"))},[e.createVNode(e.unref(b.Spin))],2)]),default:e.withCtx(()=>[o.expandable&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:0},e.unref(F.getRowExpandProps)(t.expandable),{fixed:ce.value}),{content:e.withCtx(n=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(n))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:1},e.unref(F.getRowSelectionProps)(e.unref(f),s.value),{field:e.unref(E.ROW_SELECTION_FIELD)}),null,16,["field"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(Q),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:n.props.colId}))),128))]),_:2},[e.renderList(e.unref(i.omit)(g,["searchFormExtra"]),(n,a)=>({name:a,fn:e.withCtx(c=>[e.renderSlot(t.$slots,a,e.normalizeProps(e.guardReactiveProps(c||{})))])}))]),1040,["data","sort-config","filter-config","loading","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("pagination-wrapper"))},[t.sticky?(e.openBlock(),e.createBlock(e.unref(_e.default),{key:0,direction:"horizontal","scroll-container":Z.value,"extra-size":-4.2,"bar-color":"var(--ap-scrollbar-thumb-color-base)","track-color":"var(--ap-table-header-bg, #f2f6f9)"},null,8,["scroll-container"])):e.createCommentVNode("",!0),t.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(b.Pagination),e.mergeProps({key:1,class:e.unref(u)("pagination")},e.unref(T).pagination,{onChange:e.unref(ue)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=Ae;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),v=require("vxe-table");require("vxe-table/es/style.css");const i=require("lodash-unified"),be=require("../ap-form/index.js");require("../config-provider/index.js");const Re=require("../ap-table/constants.js"),p=require("../ap-table/utils.js"),xe=require("../ap-table/hooks/use-table-paging-ng.js"),b=require("@aplus-frontend/antdv"),ke=require("./hooks/use-inner-params.js"),F=require("./utils/table.js"),Be=require("./hooks/use-row-selection.js"),Fe=require("../ap-table/context.js"),E=require("./constants.js"),Ee=require("./hooks/use-render-columns.js"),Ie=require("@aplus-frontend/antdv/es/theme/internal");require("../scroll-bar/index.js");const Ne=require("../utils/index.js"),Pe=require("../utils/slot.js"),Ve=require("./hooks/use-table-style.js"),qe=require("../config-provider/hooks/use-namespace.js"),ze=require("../config-provider/hooks/use-global-config.js"),Te=require("../config-provider/hooks/use-locale.js"),_e=require("../scroll-bar/index.vue.js"),Ae=e.defineComponent({name:"ApGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},tableLayout:{},title:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object],default:!1},transformCellText:{},rowClassName:{},stripe:{type:Boolean},headerRowClassName:{},footerRowClassName:{},cellClassName:{},headerCellClassName:{},footerCellClassName:{},rowStyle:{},headerRowStyle:{},footerRowStyle:{},cellStyle:{},headerCellStyle:{},footerCellStyle:{},height:{},minHeight:{},maxHeight:{},mergeCells:{},mergeFooterItems:{},cellConfig:{},loading:{type:Boolean,default:void 0},loadingConfig:{},headerCellConfig:{},footerCellConfig:{},round:{type:Boolean,default:void 0},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean,default:!1},columnResizable:{type:[Boolean,Object],default:!1},rowKey:{default:"key"},footer:{},virtual:{type:[Boolean,Object],default:void 0},expandable:{},value:{},rowHighlightable:{type:[Boolean,Function],default:!1},treeConfig:{}},setup(M,{expose:W}){var U;const g=e.useSlots(),o=M,y=(U=e.getCurrentInstance())==null?void 0:U.appContext.app;y&&!y.__VXE_PC_UI_INSTALLED__&&(y.use(v.VxeUI),y.__VXE_PC_UI_INSTALLED__=!0);const{e:S,b:u,be:j}=qe.useNamespace("ap-grid"),H=ze.useGlobalConfig("valueTypeMap"),s=e.ref([]),I=e.ref([]),l=e.ref(),w=e.ref(o.size),G=Ve.useTableStyle(),[,X]=Ie.useToken(),{t:J}=Te.useLocale();v.VxeUI.setConfig({i18n:(t,r)=>J(`ap.${t}`,r)});const{renderConfig:Q,updateSignal:Y}=Ee.useRenderColumns(s);let N=0;const Z=e.computed(()=>{if(l.value)return l.value.$el.querySelector(".vxe-table--header-inner-wrapper")}),P=e.computed(()=>{var t,r,n;return N++,((n=(r=(t=o.columns)==null?void 0:t.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!Re.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:r.sort((a,c)=>{let h=p.getColumnOrder(a.order);return p.getColumnOrder(c.order)-h}))==null?void 0:n.map(a=>{const c=p.updateFormProps(a,p.getFieldProps(a.fieldProps,{})),h={...a,fieldProps:{label:a.title,name:a.dataIndex,bordered:!0,...c||{},_signal:N},renderNode:void 0};return h.renderNode=p.getSearchFormItemRenderNode(h,e.unref(H)),h}))||[]}),ee=e.computed(()=>{var r;return Ne.isDef(o.manual)?o.manual:Pe.getValidVNodeList(((r=g.searchFormExtra)==null?void 0:r.call(g))||[]).some(n=>{var a;return((a=n.type)==null?void 0:a.name)==="ApView"})}),te=e.computed(()=>[u(),o.card?null:u("wrapper"),o.adaptive?u("adaptive"):null,o.sticky?u("sticky"):null].filter(Boolean)),V=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.sorter===!0)return t.key||t.dataIndex}).filter(Boolean)),q=e.computed(()=>p.recursionApColumns(e.unref(s),t=>{if(t.filters&&!t.onFilter)return t.key||t.dataIndex}).filter(Boolean)),{formRef:m,submit:R,reset:x,refresh:z,data:d,tableProps:T,setDataSource:re,handleTableChangeOptional:oe,getPaging:ae,setPaging:ne,submitWith:_}=xe.useTablePaging({async request(t){var n;if(!f.value.preserveSelectedRowKeys&&i.isUndefined(o.dataSource)&&B(),!i.isUndefined(o.dataSource)){const a=t.pageSize*(t.current-1);return{data:(o.pagination===!1?o.dataSource:o.dataSource.slice(a,a+t.pageSize))||[],total:o.dataSource.length||0}}const r=await((n=o.request)==null?void 0:n.call(o,t));return{data:(r==null?void 0:r.data)||[],total:(r==null?void 0:r.total)||0}},namespace:"ap-grid",filterFields:q,sortFields:V,params:e.toRef(o,"params"),defaultData:o.defaultData,manual:e.unref(ee),formatParams:o.beforeSearchSubmit,pagination:o.pagination,onClickReset:Se,onAfterRequest:$}),{sortChangeEvent:le,filterChangeEvent:se,paginationChangeEvent:ue}=ke.useInnerParams(oe);Fe.useProvideApTable({columns:e.computed(()=>s.value),columnsBackup:e.computed(()=>I.value),size:e.computed(()=>E.sizeMap[w.value]),updateColumns(t){var r;s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t)},updateSize(t){w.value=E.sizeReverseMap[t]},renderConfig:e.computed(()=>({className:j("table-header","title"),color:X.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(d).records),getSearchFormValues:L,setSearchFormValues:A,submit:R,submitWith:_,reset:x,refresh:z,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O});const ce=e.computed(()=>s.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),ie=e.computed(()=>i.isUndefined(o.loading)?d.loading:o.loading),de=e.computed(()=>i.isUndefined(o.dataSource)?d.records:o.dataSource),{selectedRows:k,rowSelection:f,...C}=Be.default({...o.rowSelection===!0?{}:o.rowSelection,dataSource:de,rowKey:o.rowKey}),fe=({checked:t})=>{const r=l.value;r&&r&&C.selectChange(t,r.getCheckboxRecords(),r.getCheckboxReserveRecords())},pe=({checked:t})=>{const r=l.value;r&&C.selectAllChange(t,[...r.getCheckboxReserveRecords(),...r.getCheckboxRecords()])},me=()=>{const t=l.value;t&&C.selectRangeChange(t.getCheckboxRecords(),[...t.getCheckboxReserveRecords(),...t.getCheckboxRecords()])},ge=()=>{const t=l.value;t&&(k.value=[t.getRadioRecord()])},Ce=({row:t})=>{const r=o.rowHighlightable;i.isFunction(r)&&r(t)};function he(){var t;return((t=o.columns)==null?void 0:t.filter(r=>!r.hideInTable))||[]}function A(t){var r,n,a;(a=(n=(r=m.value)==null?void 0:r.apForm)==null?void 0:n.setFieldsValue)==null||a.call(n,t)}function L(t=!1){var n,a,c;const r=t?"getFieldsValueTransformed":"getFieldsValue";return(c=(a=(n=m.value)==null?void 0:n.apForm)==null?void 0:a[r])==null?void 0:c.call(a,!0)}function K(){var t;return((t=m.value)==null?void 0:t.getSorterItems())||[]}function D(t){var r;(r=m.value)==null||r.setSorterItems(t)}function O(){var t;(t=m.value)==null||t.resetSorterItems()}function B(){C.clearAll();const t=l.value;t&&(f.value.type==="radio"?(t.clearRadioRow(),t.clearRadioReserve()):(t.clearCheckboxRow(),t.clearCheckboxReserve()))}function ve(t){i.isFunction(o.rowKey)||(C.selectMultiByKeys(t),$())}function ye(t){const r=l.value;if(!r)return;const n=String(t[o.rowKey]),a=r.getRowById(n);r.setCurrentRow(a)}function Se(){const t=l.value;t&&(t.clearSort(),t.clearFilter())}function $(){e.nextTick(()=>{var t,r;f.value.type==="radio"?(t=l.value)==null||t.setRadioRowKey(f.value.selectedRowKeys[0]):(r=l.value)==null||r.setCheckboxRowKey(f.value.selectedRowKeys,!0)})}async function we(t,r){var a;const n=d.records[t];if(n)return(a=l.value)==null?void 0:a.scrollToRow(n,r)}return e.watch(()=>[o.columnResizable,o.columns],()=>{var r;const t=he();s.value=t,(r=o.onShownColumnsChange)==null||r.call(o,t),I.value=t},{deep:!0,immediate:!0}),e.watch(()=>o.dataSource,t=>{re(t)},{immediate:!0,deep:!0}),e.watch(()=>e.unref(d).loading,t=>{var r;(r=o.onLoadingChange)==null||r.call(o,t)}),e.watch(()=>o.size,t=>{w.value=t}),W({submit:R,reset:x,refresh:z,submitWith:_,setSearchFormValues:A,getSearchFormValues:L,getShowColumns:()=>e.unref(s),rowSelection:{selectedRows:e.computed(()=>k.value),setSelectedRowKeys:ve,clearAll:B},scrollToRow:we,getDataSource:()=>e.unref(d.records),setCurrentRow:ye,getPaging:ae,setPaging:ne,getSearchFormSorterItems:K,setSearchFormSorterItems:D,resetSearchFormSorterItems:O}),(t,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(te.value),style:e.normalizeStyle(t.wrapperStyle)},[e.unref(i.isUndefined)(t.dataSource)&&t.searchForm!==!1&&P.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(S)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(be.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(T).loading,onSubmit:e.unref(R),onReset:e.unref(x)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(P.value,n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(S)("table-wrapper"),t.card?e.unref(S)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("header-wrapper"))},[e.renderSlot(t.$slots,"title",{selectedRows:e.unref(k),selectedRowKeys:e.unref(f).selectedRowKeys,shownColumns:s.value,clearAll:B})],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("vxe-wrapper"))},[(e.openBlock(),e.createBlock(e.unref(v.VxeTable),e.mergeProps(e.unref(F.toVxeProps)(o),{ref_key:"tableRef",ref:l,key:e.unref(Y),data:e.unref(d).records,"sort-config":{remote:V.value.length>0,trigger:"cell"},"filter-config":{remote:q.value.length>0},loading:ie.value,style:e.unref(G),size:w.value,onSortChange:e.unref(le),onFilterChange:e.unref(se),onCheckboxChange:fe,onCheckboxRangeChange:me,onCheckboxAll:pe,onRadioChange:ge,onCurrentChange:Ce}),e.createSlots({empty:e.withCtx(()=>[e.createVNode(e.unref(b.Empty),{image:e.unref(b.Empty).PRESENTED_IMAGE_SIMPLE},null,8,["image"])]),loading:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(S)("table-loading-wrapper"))},[e.createVNode(e.unref(b.Spin))],2)]),default:e.withCtx(()=>[o.expandable&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:0},e.unref(F.getRowExpandProps)(t.expandable),{fixed:ce.value}),{content:e.withCtx(n=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.expandable.renderContent(n))))]),_:1},16,["fixed"])):e.createCommentVNode("",!0),o.rowSelection&&s.value.length?(e.openBlock(),e.createBlock(e.unref(v.VxeColumn),e.mergeProps({key:1},e.unref(F.getRowSelectionProps)(e.unref(f),s.value),{field:e.unref(E.ROW_SELECTION_FIELD)}),null,16,["field"])):e.createCommentVNode("",!0),(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(Q),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),{key:n.props.colId}))),128))]),_:2},[e.renderList(e.unref(i.omit)(g,["searchFormExtra"]),(n,a)=>({name:a,fn:e.withCtx(c=>[e.renderSlot(t.$slots,a,e.normalizeProps(e.guardReactiveProps(c||{})))])}))]),1040,["data","sort-config","filter-config","loading","style","size","onSortChange","onFilterChange"]))],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(u)("pagination-wrapper"))},[t.sticky?(e.openBlock(),e.createBlock(e.unref(_e.default),{key:0,direction:"horizontal","scroll-container":Z.value,"extra-size":-4.2,"bar-color":"var(--ap-scrollbar-thumb-color-base)","track-color":"var(--ap-table-header-bg, #f2f6f9)"},null,8,["scroll-container"])):e.createCommentVNode("",!0),t.pagination!==!1?(e.openBlock(),e.createBlock(e.unref(b.Pagination),e.mergeProps({key:1,class:e.unref(u)("pagination")},e.unref(T).pagination,{onChange:e.unref(ue)}),null,16,["class","onChange"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=Ae;

package/lib/src/business/ap-export-group/convertExportField.d.ts

@@ -1,4 +1,6 @@
+import { ApColumnType } from '../../ap-table/interface';
+import { ApGridColumnType } from './../../ap-grid/interface';
 import { ColumnType } from '@aplus-frontend/antdv/es/table';
-export declare const convertExportField: (columns: ColumnType[], convertField?: {
+export declare const convertExportField: (columns: ColumnType[] | ApGridColumnType[] | ApColumnType[], convertField?: {
     [key: string]: string[];
 }) => any[];

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.13.4";
+declare const _default: "6.14.0";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.13.4";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.14.0";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.13.4",
+  "version": "6.14.0",
   "main": "./lib/index.js",
   "type": "module",
   "files": [

package/theme/antdv-override.css

@@ -264,18 +264,6 @@
 [data-aplus-ui-mode='aplus'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #abb7cc;
 }
-[data-aplus-ui-mode='aplus'] input[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] textarea[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] .ant-select-disabled .ant-select-selection-item {
-  color: var(--ap-text-color-1) !important;
-}
 [data-aplus-ui-mode='aplus'] .ant-input-clear-icon {
   line-height: 18px;
 }
@@ -555,18 +543,6 @@
 [data-aplus-ui-mode='admin'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #bfbfbf;
 }
-[data-aplus-ui-mode='admin'] input[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] textarea[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] .ant-select-disabled .ant-select-selection-item {
-  color: var(--ap-text-color-1) !important;
-}
 [data-aplus-ui-mode='admin'] .ant-input-clear-icon {
   line-height: 18px;
 }

package/theme/antdv-override.less

@@ -1,5 +1,4 @@
 @import './mixins/config.less';
-
 @tw: ~'@{ns}-ap-table__table-wrapper';
 @sb: ~'@{ns}-scroll-bar';
 
@@ -303,22 +302,6 @@
     color: #abb7cc;
   }
 
-  input[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  textarea[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-select-disabled .ant-select-selection-item {
-    color: var(--ap-text-color-1) !important;
-  }
-
   .ant-input-clear-icon {
     line-height: 18px;
   }
@@ -637,22 +620,6 @@
     color: #bfbfbf;
   }
 
-  input[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  textarea[disabled].ant-input {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-    color: var(--ap-text-color-1);
-  }
-
-  .ant-select-disabled .ant-select-selection-item {
-    color: var(--ap-text-color-1) !important;
-  }
-
   .ant-input-clear-icon {
     line-height: 18px;
   }

package/theme/css-var.css

@@ -23,6 +23,7 @@
   --ap-color-bg-2: #f3f5f8;
   --ap-scrollbar-thumb-color-base: #c8d1de;
   --ap-scrollbar-thumb-color-hover: #959ca7;
+  --ap-scrollbar-track-color-hover: #f2f6f9;
   --ap-text-color-4: #abb7cc;
   --batch-input-group-trigger-color-disabled: rgba(24, 41, 72, 0.25);
   --ap-radio-group-item-active-bg-color: rgba(0, 112, 255, 0.12);
@@ -54,6 +55,7 @@
   --ap-color-bg-2: #f5f5f5;
   --ap-scrollbar-thumb-color-base: #bfbfbf;
   --ap-scrollbar-thumb-color-hover: #787878;
+  --ap-scrollbar-track-color-hover: #f7f7f7;
   --ap-text-color-4: #bfbfbf;
   --batch-input-group-trigger-color-disabled: rgba(0, 0, 0, 0.25);
   --ap-radio-group-item-active-bg-color: rgba(52, 183, 124, 0.12);

package/theme/css-var.less

@@ -47,6 +47,8 @@
   --ap-scrollbar-thumb-color-base: #c8d1de;
   // 滚动条滑动块hover色
   --ap-scrollbar-thumb-color-hover: #959ca7;
+  // 滚动条轨道颜色
+  --ap-scrollbar-track-color-hover: #f2f6f9;
   // 文本颜色4号色（三级）
   --ap-text-color-4: #abb7cc;
   // 批量输入组禁用色
@@ -102,6 +104,8 @@
   --ap-scrollbar-thumb-color-base: #bfbfbf;
   // 滚动条滑动块基础色
   --ap-scrollbar-thumb-color-hover: #787878;
+  // 滚动条轨道颜色
+  --ap-scrollbar-track-color-hover: #f7f7f7;
   // 文本颜色4号色（三级）
   --ap-text-color-4: #bfbfbf;
   // 批量输入组禁用色

package/theme/index.css

@@ -23,6 +23,7 @@
   --ap-color-bg-2: #f3f5f8;
   --ap-scrollbar-thumb-color-base: #c8d1de;
   --ap-scrollbar-thumb-color-hover: #959ca7;
+  --ap-scrollbar-track-color-hover: #f2f6f9;
   --ap-text-color-4: #abb7cc;
   --batch-input-group-trigger-color-disabled: rgba(24, 41, 72, 0.25);
   --ap-radio-group-item-active-bg-color: rgba(0, 112, 255, 0.12);
@@ -54,6 +55,7 @@
   --ap-color-bg-2: #f5f5f5;
   --ap-scrollbar-thumb-color-base: #bfbfbf;
   --ap-scrollbar-thumb-color-hover: #787878;
+  --ap-scrollbar-track-color-hover: #f7f7f7;
   --ap-text-color-4: #bfbfbf;
   --batch-input-group-trigger-color-disabled: rgba(0, 0, 0, 0.25);
   --ap-radio-group-item-active-bg-color: rgba(52, 183, 124, 0.12);
@@ -331,18 +333,6 @@
 [data-aplus-ui-mode='aplus'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #abb7cc;
 }
-[data-aplus-ui-mode='aplus'] input[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] textarea[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='aplus'] .ant-select-disabled .ant-select-selection-item {
-  color: var(--ap-text-color-1) !important;
-}
 [data-aplus-ui-mode='aplus'] .ant-input-clear-icon {
   line-height: 18px;
 }
@@ -622,18 +612,6 @@
 [data-aplus-ui-mode='admin'] .ant-input-number .ant-input-number-input-wrap > input::placeholder {
   color: #bfbfbf;
 }
-[data-aplus-ui-mode='admin'] input[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] textarea[disabled].ant-input {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] .ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
-  color: var(--ap-text-color-1);
-}
-[data-aplus-ui-mode='admin'] .ant-select-disabled .ant-select-selection-item {
-  color: var(--ap-text-color-1) !important;
-}
 [data-aplus-ui-mode='admin'] .ant-input-clear-icon {
   line-height: 18px;
 }

package/theme/reset.css

@@ -255,3 +255,21 @@ mark {
   padding: 0.2em;
   background-color: #feffe6;
 }
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+::-webkit-scrollbar-thumb {
+  background-color: var(--ap-scrollbar-thumb-color-base);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-corner {
+  background-color: var(--ap-scrollbar-track-color-hover, #f2f6f9);
+}
+::-webkit-scrollbar-thumb:hover,
+::-webkit-scrollbar-thumb:active {
+  background-color: var(--ap-scrollbar-thumb-color-hover);
+}

package/theme/reset.less

@@ -118,8 +118,8 @@ code,
 kbd,
 samp {
   font-size: 1em;
-  font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier,
-    monospace;
+  font-family:
+    'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
 }
 pre {
   margin-top: 0;
@@ -255,3 +255,27 @@ mark {
   padding: 0.2em;
   background-color: #feffe6;
 }
+
+// scrolbar reset
+
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: var(--ap-scrollbar-thumb-color-base);
+  background-clip: content-box;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-corner {
+  background-color: var(--ap-scrollbar-track-color-hover, #f2f6f9);
+}
+
+::-webkit-scrollbar-thumb:hover,
+::-webkit-scrollbar-thumb:active {
+  background-color: var(--ap-scrollbar-thumb-color-hover);
+}