@aplus-frontend/ui 6.35.0 → 6.35.2

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

@@ -17,8 +17,8 @@ import { useTheme as ko } from "./theme.mjs";
 import { useColumns as xo } from "./hooks/use-columns.mjs";
 import { useColumnsDef as Io } from "./hooks/use-columns-def.mjs";
 import { isDef as To } from "../utils/index.mjs";
-import { getValidVNodeList as No } from "../utils/slot.mjs";
-import { useSearchForm as Do } from "./hooks/use-search-form.mjs";
+import { getValidVNodeList as Do } from "../utils/slot.mjs";
+import { useSearchForm as No } from "./hooks/use-search-form.mjs";
 import "./components/empty/index.vue.mjs";
 import Eo from "./hooks/use-virtual-config.mjs";
 import { usePinnedRow as Ko } from "./hooks/use-pinned-row.mjs";
@@ -105,7 +105,7 @@ const mt = /* @__PURE__ */ oo({
       T(o, "summary")
     ), ge = Ao("apGrid"), s = I(), [, we] = Fo();
     let p = !!o.dataSource;
-    const L = Do(o), { shownColumns: f, columns: U, columnKeys: Se, getTargetColumnByKey: ye } = xo(o), { defaultColDef: Ce, columnDefs: he, gridWrapperRef: ve } = Io(U, o, fe), x = I({});
+    const L = No(o), { shownColumns: f, columns: U, columnKeys: Se, getTargetColumnByKey: ye } = xo(o), { defaultColDef: Ce, columnDefs: he, gridWrapperRef: ve } = Io(U, o, fe), x = I({});
     vo({
       sorter: x,
       setSorter(e) {
@@ -143,10 +143,10 @@ const mt = /* @__PURE__ */ oo({
         return;
       const r = e.getColumnState()?.map((a) => ({ ...a, sort: null }));
       e.applyColumnState({ state: r });
-    }, ke = l(() => To(o.manual) ? o.manual : No(W.searchFormExtra?.() || []).some((r) => r.type?.name === "ApView")), {
+    }, ke = l(() => To(o.manual) ? o.manual : Do(W.searchFormExtra?.() || []).some((r) => r.type?.name === "ApView")), {
       formRef: g,
-      submit: N,
-      reset: D,
+      submit: D,
+      reset: N,
       data: w,
       tableProps: j,
       handleTableChangeOptional: $,
@@ -186,7 +186,7 @@ const mt = /* @__PURE__ */ oo({
           ...ie,
           ...e
         };
-    }), Ne = Po(o, f), De = l(
+    }), De = Po(o, f), Ne = l(
       () => F(o.dataSource) ? w.records : o.dataSource
     ), {
       select: Ee,
@@ -197,7 +197,7 @@ const mt = /* @__PURE__ */ oo({
       selectMultiByKeys: Ae
     } = ho({
       ...S,
-      dataSource: De,
+      dataSource: Ne,
       rowKey: o.rowKey
     }), Ve = {
       checkbox: "multiRow",
@@ -209,7 +209,8 @@ const mt = /* @__PURE__ */ oo({
       const { type: r = "checkbox", disabled: a } = e;
       return {
         mode: Ve[r],
-        isRowSelectable: (d) => a ? !a(d.data) : !0
+        isRowSelectable: (d) => a ? !a(d.data) : !0,
+        hideDisabledCheckboxes: e.hideDisabled ?? !1
       };
     });
     function K(e) {
@@ -315,9 +316,9 @@ const mt = /* @__PURE__ */ oo({
       dataSource: l(() => t(w).records),
       getSearchFormValues: X,
       setSearchFormValues: Y,
-      submit: N,
+      submit: D,
       submitWith: q,
-      reset: D,
+      reset: N,
       refresh: J,
       getSearchFormSorterItems: Z,
       setSearchFormSorterItems: _,
@@ -382,8 +383,8 @@ const mt = /* @__PURE__ */ oo({
         o.onLoadingChange?.(e);
       }
     ), ue({
-      submit: N,
-      reset: D,
+      submit: D,
+      reset: N,
       refresh: J,
       submitWith: q,
       setSearchFormValues: Y,
@@ -418,8 +419,8 @@ const mt = /* @__PURE__ */ oo({
           ref: g,
           "custom-reset": "",
           "submit-loading": t(j).loading,
-          onSubmit: t(N),
-          onReset: t(D)
+          onSubmit: t(D),
+          onReset: t(N)
         }), ao({
           default: ne(() => [
             (b(!0), A(no, null, lo(t(L), (a) => (b(), le(so(a.renderNode), {
@@ -464,7 +465,7 @@ const mt = /* @__PURE__ */ oo({
             "default-col-def": t(Ce),
             "suppress-loading-overlay": "",
             "row-selection": Me.value,
-            "selection-column-def": t(Ne),
+            "selection-column-def": t(De),
             "get-row-id": qe,
             theme: t(me),
             "tooltip-show-delay": 500,

package/es/src/ag-grid/interface.d.ts

@@ -119,6 +119,10 @@ export type AgGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>,
      * 行选择列自定义tooltip
      */
     tooltip?: string | ((checked: boolean, disabled: boolean, rowNode: IRowNode) => string | any);
+    /**
+     * 是否隐藏不可选中的元素
+     */
+    hideDisabled?: boolean;
 };
 export type AgGridVirtualConfig = {
     row?: boolean;

package/es/src/ap-form/item/index.vue.mjs

@@ -1,7 +1,7 @@
-import { defineComponent as D, useSlots as L, ref as c, onMounted as _, computed as M, unref as l, cloneVNode as $, createBlock as v, openBlock as y, mergeProps as j, createSlots as q, withCtx as a, resolveDynamicComponent as E, renderList as K, createElementVNode as O, normalizeClass as Q, createVNode as u, normalizeStyle as U, renderSlot as Y, normalizeProps as G, guardReactiveProps as H } from "vue";
+import { defineComponent as D, useSlots as L, ref as c, onMounted as _, computed as M, unref as l, cloneVNode as $, createBlock as b, openBlock as v, mergeProps as j, createSlots as q, withCtx as a, resolveDynamicComponent as E, renderList as K, createElementVNode as O, normalizeClass as Q, createVNode as d, normalizeStyle as U, renderSlot as Y, normalizeProps as G, guardReactiveProps as H } from "vue";
 import { Form as J, Tooltip as W, TypographyText as X } from "@aplus-frontend/antdv";
 import { useToken as Z } from "@aplus-frontend/antdv/es/theme/internal";
-import { isFunction as b, cloneDeep as ee, isArray as oe, omit as F } from "lodash-unified";
+import { isFunction as y, cloneDeep as ee, isArray as oe, omit as F } from "lodash-unified";
 import { apFormItemColPropKeys as le } from "../constant.mjs";
 import { QuestionCircleOutlined as te } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
@@ -57,9 +57,9 @@ const Ve = /* @__PURE__ */ D({
     disabled: { type: Boolean }
   },
   setup(V, { expose: g }) {
-    const e = V, d = L(), { model: m, updateModel: B, internalInstance: h } = re(), { m: i, b: C } = ie("ap-form-item"), s = c(!1), r = c(), [, k] = Z();
+    const e = V, u = L(), { model: m, updateModel: B, internalInstance: h } = re(), { m: i, b: C } = ie("ap-form-item"), s = c(!1), r = c(), [, k] = Z();
     _(async () => {
-      let o = b(e.initialValue) ? e.initialValue() : e.initialValue;
+      let o = y(e.initialValue) ? e.initialValue() : e.initialValue;
       ae(o) && (o = await o), h?.registerField({
         name: e.name,
         initialValue: ee(o),
@@ -68,7 +68,7 @@ const Ve = /* @__PURE__ */ D({
     });
     const f = M(() => e.name ? oe(e.name) ? e.name.reduce((o, t) => o?.[t], l(m)) : m?.value[e.name] : null);
     function x() {
-      const o = d.default?.() || [];
+      const o = u.default?.() || [];
       if (!e.name)
         return o[0];
       const t = ne(o)[0];
@@ -76,6 +76,7 @@ const Ve = /* @__PURE__ */ D({
         [e.valuePropName]: l(f),
         [`onUpdate:${e.valuePropName}`]: N,
         variant: e.bordered ? "borderless" : t?.props?.variant,
+        bordered: e.bordered ? !1 : t?.props?.bordered,
         onFocus: P,
         onBlur: I
       }) : null;
@@ -105,7 +106,7 @@ const Ve = /* @__PURE__ */ D({
       const t = l(f);
       if (!o || !e.transform)
         return t;
-      const n = b(e.transform) ? e.transform : e.transform.transformer;
+      const n = y(e.transform) ? e.transform : e.transform.transformer;
       return e.transform ? n(t) : t;
     }
     return g({
@@ -114,7 +115,7 @@ const Ve = /* @__PURE__ */ D({
       clearValidate: w,
       resetField: z,
       getFieldValue: R
-    }), (o, t) => (y(), v(l(J).Item, j(
+    }), (o, t) => (v(), b(l(J).Item, j(
       {
         ref_key: "formItemRef",
         ref: r
@@ -131,7 +132,7 @@ const Ve = /* @__PURE__ */ D({
       }
     ), q({
       default: a(() => [
-        (y(), v(E(x())))
+        (v(), b(E(x())))
       ]),
       _: 2
     }, [
@@ -141,11 +142,11 @@ const Ve = /* @__PURE__ */ D({
           O("span", {
             class: Q(n)
           }, [
-            u(l(W), {
+            d(l(W), {
               title: e.tooltip
             }, {
               default: a(() => [
-                u(l(te), {
+                d(l(te), {
                   style: U({
                     color: l(k).colorTextTertiary,
                     fontSize: "14px",
@@ -162,7 +163,7 @@ const Ve = /* @__PURE__ */ D({
       o.label ? {
         name: "label",
         fn: a(() => [
-          u(l(X), {
+          d(l(X), {
             content: o.label,
             ellipsis: { tooltip: o.label },
             style: { "min-width": "0px", flex: "1" }
@@ -170,7 +171,7 @@ const Ve = /* @__PURE__ */ D({
         ]),
         key: "1"
       } : void 0,
-      K(l(F)(d, "default"), (n, p) => ({
+      K(l(F)(u, "default"), (n, p) => ({
         name: p,
         fn: a((A) => [
           Y(o.$slots, p, G(H(A || {})))

package/es/src/business/hooks/useKeepAliveFlag.d.ts

@@ -1,6 +1,8 @@
 interface UseKeepAliveFlagOptions {
     /** 状态切换到deactivated时触发 */
     afterDeactivated?: () => void;
+    /** 状态切换到activated时触发 */
+    afterActivated?: () => void;
 }
 /**
  * 获取keepAliveFlag
@@ -10,5 +12,6 @@ export declare function useKeepAliveFlag(options?: UseKeepAliveFlagOptions): {
     isDeactivated: () => boolean;
     isActivated: () => boolean;
     registerAfterDeactivated: (fn: UseKeepAliveFlagOptions["afterDeactivated"]) => void;
+    registerAfterActivated: (fn: UseKeepAliveFlagOptions["afterActivated"]) => void;
 };
 export {};

package/es/src/business/hooks/useKeepAliveFlag.mjs

@@ -1,18 +1,21 @@
 import { onActivated as v, onDeactivated as c } from "vue";
-function o(a) {
-  let e = "notKeepAlive", t = a?.afterDeactivated;
+function s(i) {
+  let e = "notKeepAlive", r = i?.afterDeactivated, t = i?.afterActivated;
   return v(() => {
-    e = "activated";
+    t && e === "deactivated" && Promise.resolve().then(t), e = "activated";
   }), c(() => {
-    e = "deactivated", t?.();
+    e = "deactivated", r?.();
   }), {
     isDeactivated: () => e === "deactivated",
     isActivated: () => e === "activated",
-    registerAfterDeactivated: (i) => {
-      t = i;
+    registerAfterDeactivated: (a) => {
+      r = a;
+    },
+    registerAfterActivated: (a) => {
+      t = a;
     }
   };
 }
 export {
-  o as useKeepAliveFlag
+  s as useKeepAliveFlag
 };

package/es/src/business/hooks/usePageListAgGrid.d.ts

@@ -1,4 +1,3 @@
-import { UseTableRefreshOption } from '..';
 import { AgGridExpose, AgGridProps } from '../../ag-grid';
 export interface UsePageListAgGrid extends AgGridProps {
     /** 是否显示默认的行选择配置
@@ -18,7 +17,7 @@ export interface UsePageListAgGrid extends AgGridProps {
     /**
      * 表格刷新相关
      */
-    tableRefresh?: boolean | Omit<UseTableRefreshOption, 'apTableRef'>;
+    tableRefresh?: boolean | (() => boolean);
     /** 是否需要在deactivated的时候清空数据
      * @default true
      */

package/es/src/business/hooks/usePageListAgGrid.mjs

@@ -1,53 +1,49 @@
-import "../index.mjs";
-import { merge as v, cloneDeep as A } from "lodash-unified";
-import { ref as F } from "vue";
+import { isFunction as g, merge as A, cloneDeep as F } from "lodash-unified";
+import { ref as w } from "vue";
 import { useKeepAliveFlag as R } from "./useKeepAliveFlag.mjs";
-import { useTableRefresh as w } from "./useTableRefresh.mjs";
-function y(a) {
-  const r = F(null), {
-    isShowRowSelection: c = !0,
-    clearSelectionOnRequest: i = !0,
+function O(l) {
+  const r = w(null), {
+    isShowRowSelection: u = !0,
+    clearSelectionOnRequest: d = !0,
     transformSearchFormValues: o,
-    api: s,
-    tableRefresh: f = !0,
-    clearDataOnDeactivated: d = !0,
+    api: a,
+    tableRefresh: s = !0,
+    clearDataOnDeactivated: f = !0,
     ...m
-  } = a || {};
+  } = l || {};
   let n = null;
-  const l = () => {
+  const i = () => {
     r.value?.rowSelection?.clearAll();
-  };
-  w({
-    ...V(f),
-    apTableRef: r
-  });
-  const u = (e) => {
+  }, c = (e) => {
     r.value?.submitWith(e);
   }, p = () => {
     r.value?.reset();
   }, { isDeactivated: h } = R({
-    afterDeactivated: u
+    afterActivated() {
+      (g(s) ? s() : s) && c();
+    },
+    afterDeactivated: c
   });
-  return [v(
+  return [A(
     {
       // scroll，tableLayout，columnResizable设置表格可拖动
       columnResizable: !0,
-      request: s ? async (e) => {
-        if (h() && d)
+      request: a ? async (e) => {
+        if (h() && f)
           return {
             data: [],
             total: 0
           };
         n = e.sort;
         const t = o ? o(e) : e;
-        if (!s) throw new Error("api is not defined");
-        const { records: S, total: g } = await s(t);
-        return i && l(), {
-          data: S,
-          total: g
+        if (!a) throw new Error("api is not defined");
+        const { records: v, total: S } = await a(t);
+        return d && i(), {
+          data: v,
+          total: S
         };
       } : void 0,
-      rowSelection: c ? {
+      rowSelection: u ? {
         fixed: "left",
         columnWidth: 38
       } : void 0,
@@ -59,7 +55,7 @@ function y(a) {
     },
     m
   ), {
-    reload: u,
+    reload: c,
     reset: p,
     getSearchFormValues: (e = !0) => {
       const t = r.value?.getSearchFormValues(!!e) || {};
@@ -68,16 +64,11 @@ function y(a) {
     getAgGridInstance: () => r.value,
     getSearchFormValuesAndSorted: (e = !0) => {
       const t = r.value?.getSearchFormValues(!!e) || {};
-      return t.sort = n && A(n), o ? o(t) : t;
+      return t.sort = n && F(n), o ? o(t) : t;
     },
-    clearSelection: l
+    clearSelection: i
   }];
 }
-function V(a) {
-  return a === !0 ? {} : a === !1 ? {
-    refreshBefore: () => !1
-  } : a;
-}
 export {
-  y as usePageListAgGrid
+  O as usePageListAgGrid
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.35.0";
+declare const _default: "6.35.2";
 export default _default;

package/es/src/version.mjs

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

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),Ue=require("ag-grid-vue3"),j=require("ag-grid-community"),Ge=require("./utils.js"),$=require("@aplus-frontend/antdv"),d=require("lodash-unified");require("../config-provider/index.js");const We=require("../ap-form/index.js"),Le=require("../ap-table/utils.js"),_e=require("../ap-table/hooks/use-table-paging-ng.js"),He=require("./hooks/use-row-selection.js"),je=require("./context.js"),$e=require("../ap-table/context.js"),B=require("../ap-grid/constants.js"),Je=require("@aplus-frontend/antdv/es/theme/internal"),Qe=require("./theme.js"),Xe=require("./hooks/use-columns.js"),Ye=require("./hooks/use-columns-def.js"),Ze=require("../utils/index.js"),eo=require("../utils/slot.js"),oo=require("./hooks/use-search-form.js");require("./components/empty/index.vue.js");const to=require("./hooks/use-virtual-config.js"),ro=require("./hooks/use-pinned-row.js"),no=require("./hooks/use-selection-col-def.js"),ao=require("../config-provider/hooks/use-namespace.js"),lo=require("../config-provider/hooks/use-global-config.js"),so=require("./components/empty/index.vue2.js"),uo=e.defineComponent({name:"AgGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{},showSorterTooltip:{type:[Boolean,Object]},prefixCls:{},rowKey:{type:[String,Function],default:"key"},tableLayout:{},title:{},id:{},showHeader:{type:Boolean},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean]},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean},indentSize:{},expandIconColumnIndex:{},showExpandColumn:{type:Boolean},expandedRowClassName:{},childrenColumnName:{},rowExpandable:{},transformCellText:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},tableStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean},columnResizable:{type:Boolean,default:!1},loading:{type:Boolean,default:void 0},summary:{},rowHeight:{},advanceRenderer:{type:Boolean},browserTooltips:{type:Boolean},virtual:{type:[Boolean,Object],default:void 0},onRowClicked:{},onScrollEnd:{},rowClassName:{},rowClassRules:{},autoHeight:{type:Boolean},onUpdate:{}},setup(J,{expose:Q}){j.ModuleRegistry.registerModules([j.AllCommunityModule]);const t=J,I=e.useSlots(),{e:R,b:i,be:X}=ao.useNamespace("ag-grid"),y=e.ref(t.size),Y=Qe.useTheme(y,e.toRef(t,"rowHeight")),Z=to.default(e.toRef(t,"virtual")),{rowPinnedGridConfig:E,getRowPinnedCellClass:ee}=ro.usePinnedRow(e.toRef(t,"summary")),oe=lo.useGlobalConfig("apGrid"),l=e.ref(),[,te]=Je.useToken();let f=!!t.dataSource;const T=oo.useSearchForm(t),{shownColumns:p,columns:z,columnKeys:re,getTargetColumnByKey:ne}=Xe.useColumns(t),{defaultColDef:ae,columnDefs:le,gridWrapperRef:se}=Ye.useColumnsDef(z,t,ee),b=e.ref({});je.useProvideSorter({sorter:b,setSorter(o){b.value=o}});const ue={asc:"ascend",desc:"descend"};function ie(){const o=l.value.getColumns()?.filter(c=>c.getSort()!==void 0),r=e.unref(b)||{};let n=o?.[0];const u=Object.keys(r);if(u.length&&u.every(c=>r[c]===null)){const c=Object.keys(r)[0];c&&(n=l.value?.getColumn(c))}if(!n)return;const s=n.getColDef(),S=n.getSort(),h=ne(s.colId);V(void 0,void 0,{column:s,field:h?.field??s.field??s.colId,order:S?ue[S]:null})}const ce=e.computed(()=>Le.recursionApColumns(e.unref(p),o=>{if(o.sorter===!0)return o.field??o.dataIndex??o.key}).filter(Boolean)),de=()=>{b.value={};const o=l.value;if(!o)return;const r=o.getColumnState()?.map(n=>({...n,sort:null}));o.applyColumnState({state:r})},fe=e.computed(()=>Ze.isDef(t.manual)?t.manual:eo.getValidVNodeList(I.searchFormExtra?.()||[]).some(r=>r.type?.name==="ApView")),{formRef:m,submit:k,reset:F,data:g,tableProps:D,handleTableChangeOptional:V,submitWith:P,refresh:K,getPaging:pe,setPaging:me,setDataSource:ge}=_e.useTablePaging({async request(o){if(f=!1,w.value&&!w.value.preserveSelectedRowKeys&&d.isUndefined(t.dataSource)&&q(),!d.isUndefined(t.dataSource)){const n=o.pageSize*(o.current-1);return{data:(t.pagination===!1?t.dataSource:t.dataSource.slice(n,n+o.pageSize))||[],total:t.dataSource.length||0}}const r=await t.request?.(o);return{data:r?.data||[],total:r?.total||0}},namespace:"ap-grid",filterFields:e.ref([]),params:e.toRef(t,"params"),defaultData:t.defaultData,manual:e.unref(fe),formatParams:t.beforeSearchSubmit,pagination:t.pagination,sortFields:ce,onClickReset:de}),w=e.computed(()=>{const o=t.rowSelection||oe.value?.rowSelection;if(o)return o===!0?B.DEFAULT_ROW_SELECTION_CONFIG:{...B.DEFAULT_ROW_SELECTION_CONFIG,...o}}),we=no.default(t,p),Se=e.computed(()=>d.isUndefined(t.dataSource)?g.records:t.dataSource),{select:ye,unSelect:Ce,selectedRows:N,selectedRowKeys:he,clearAll:ve,selectMultiByKeys:Re}=He.default({...w,dataSource:Se,rowKey:t.rowKey}),be={checkbox:"multiRow",radio:"singleRow"},Be=e.computed(()=>{const o=w.value;if(!o)return;const{type:r="checkbox",disabled:n}=o;return{mode:be[r],isRowSelectable:u=>n?!n(u.data):!0}});function x(o){return d.isFunction(t.rowKey)?t.rowKey(o):o[t.rowKey]}const A=({api:o=l.value})=>{if(t.onUpdate?.(),!w.value)return;const r=N.value;if(!r.length){setTimeout(()=>{f=!0},0);return}f=!1;const n=[];o.forEachNode(u=>{const C=u.data,s=x(C);r.find(S=>x(S)===s)&&n.push(u)}),o.setNodesSelected({nodes:n,newValue:!0}),setTimeout(()=>{f=!0},0)},ke=o=>{f&&(o.node.isSelected()?ye(o.data):Ce(o.data),d.isFunction(w.value?.tooltip)&&o.api.refreshCells({rowNodes:[o.node],columns:["ag-Grid-SelectionColumn"],force:!0}))},Fe=()=>{f=!0},q=()=>{ve(),l.value?.deselectAll()};function Ne(o){Re(o),e.nextTick(()=>{A({})})}function O(o=!1){const r=o?"getFieldsValueTransformed":"getFieldsValue";return m.value?.apForm?.[r]?.(!0)}function M(o){m.value?.apForm?.setFieldsValue?.(o)}function U(){return m.value?.getSorterItems()||[]}function G(o){m.value?.setSorterItems(o)}function W(){m.value?.resetSorterItems()}function L(o){return o&&String(o)}function xe(o){const r=l.value;if(!r)return;const n=r.getColumnState()||[],u=o.map(a=>a.key?String(a.key):a.key).filter(Boolean),C=n.map(a=>{if(!re.value.includes(a.colId))return a;const v=!u.includes(a.colId),_={...a,hide:v},H=o.find(Me=>L(Me.key)===a.colId);return H&&(_.pinned=H.fixed||null),_}),s=new Map(o.map((a,v)=>[L(a.key),v])),S=C.filter(a=>s.has(a.colId)).sort((a,v)=>s.get(a.colId)-s.get(v.colId)),h=[];let c=0;for(const a of C)s.has(a.colId)?h.push(S[c++]):h.push(a);r.applyColumnState({state:h,applyOrder:!0})}$e.useProvideApTable({columns:e.computed(()=>p.value),columnsBackup:e.computed(()=>z.value),size:e.computed(()=>B.sizeMap[y.value]),updateColumns(o){p.value=o,t.onShownColumnsChange?.(o),xe(o)},updateSize(o){y.value=B.sizeReverseMap[o]},renderConfig:e.computed(()=>({className:X("table-header","title"),color:te.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(g).records),getSearchFormValues:O,setSearchFormValues:M,submit:k,submitWith:P,reset:F,refresh:K,getSearchFormSorterItems:U,setSearchFormSorterItems:G,resetSearchFormSorterItems:W});const qe=e.computed(()=>d.isUndefined(t.loading)?g.loading:t.loading),Ie=e.computed(()=>[i(),t.card?null:i("wrapper"),i("adaptive"),i(`size-${y.value}`)].filter(Boolean)),Ee=e.computed(()=>({height:"100%",...t.tableStyle||{}})),Te=(o,r)=>{V({current:o,pageSize:r})};function ze(o){const r=o.data;return x(r)}function De(o,r){l.value?.ensureIndexVisible(o,r)}function Ve(o){t.onRowClicked?.(o.data,o.event)}function Pe(o){t.onScrollEnd?.(o.direction)}function Ke(o){return l.value?.refreshCells(o)}function Ae(o){return l.value?.redrawRows(o)}const Oe=o=>{const r=[E.value.getRowClass?.(o)];if(!o.node.rowPinned){const n=d.isFunction(t.rowClassName)?t.rowClassName(o.data,o.rowIndex):t.rowClassName;r.push(n)}return r.flat().filter(Boolean)};return e.watch(()=>t.dataSource,o=>{ge(o)},{immediate:!0,deep:!0}),e.watch(()=>t.size,o=>{y.value=o}),e.watch(()=>e.unref(g).loading,o=>{t.onLoadingChange?.(o)}),Q({submit:k,reset:F,refresh:K,submitWith:P,setSearchFormValues:M,getSearchFormValues:O,getShowColumns:()=>e.unref(p),rowSelection:{selectedRows:e.computed(()=>N.value),setSelectedRowKeys:Ne,clearAll:q},scrollToRow:De,getDataSource:()=>e.unref(g.records),getPaging:pe,setPaging:me,getSearchFormSorterItems:U,setSearchFormSorterItems:G,resetSearchFormSorterItems:W,refreshCells:Ke,redrawRows:Ae,_internalGridApi:e.computed(()=>l.value)}),(o,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(Ie.value),style:e.normalizeStyle(o.wrapperStyle)},[e.unref(d.isUndefined)(o.dataSource)&&o.searchForm!==!1&&e.unref(T).length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(o.card?e.unref(R)("search-wrapper"):null),style:e.normalizeStyle(o.searchFormWrapperStyle)},[e.createVNode(e.unref(We.ApForm).SearchForm,e.mergeProps(o.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(D).loading,onSubmit:e.unref(k),onReset:e.unref(F)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(T),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[I.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(o.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(R)("table-wrapper"),o.card?e.unref(R)("table-wrapper-card"):null]),style:e.normalizeStyle(o.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("header-wrapper"))},[e.renderSlot(o.$slots,"title",{selectedRows:e.unref(N),selectedRowKeys:e.unref(he),shownColumns:e.unref(p),clearAll:q})],2),e.createElementVNode("div",{ref_key:"gridWrapperRef",ref:se,class:e.normalizeClass(e.unref(i)("grid-wrapper"))},[e.createVNode(e.unref(Ue.AgGridVue),e.mergeProps(e.unref(Ge.mergeProps)(e.unref(Z),e.unref(E)),{"get-row-class":Oe,style:Ee.value,"row-data":e.unref(g).records,"column-defs":e.unref(le),"default-col-def":e.unref(ae),"suppress-loading-overlay":"","row-selection":Be.value,"selection-column-def":e.unref(we),"get-row-id":ze,theme:e.unref(Y),"tooltip-show-delay":500,"enable-browser-tooltips":o.browserTooltips,"tooltip-interaction":"","row-class-rules":o.rowClassRules,"no-rows-overlay-component":so.default,"suppress-cell-focus":"","dom-layout":o.autoHeight?"autoHeight":"normal",onSortChanged:ie,onGridReady:r[0]||(r[0]=n=>l.value=n.api),onRowDataUpdated:A,onRowSelected:ke,onFirstDataRendered:Fe,onRowClicked:Ve,onBodyScrollEnd:Pe}),null,16,["style","row-data","column-defs","default-col-def","row-selection","selection-column-def","theme","enable-browser-tooltips","row-class-rules","dom-layout"]),e.withDirectives(e.createElementVNode("div",{class:e.normalizeClass(e.unref(R)("table-loading-wrapper"))},[e.createVNode(e.unref($.Spin),{delay:300})],2),[[e.vShow,qe.value]])],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("pagination-wrapper"))},[o.pagination!==!1?(e.openBlock(),e.createBlock(e.unref($.Pagination),e.mergeProps({key:0,class:e.unref(i)("pagination")},e.unref(D).pagination,{onChange:Te}),null,16,["class"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=uo;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),Ue=require("ag-grid-vue3"),j=require("ag-grid-community"),Ge=require("./utils.js"),$=require("@aplus-frontend/antdv"),d=require("lodash-unified");require("../config-provider/index.js");const We=require("../ap-form/index.js"),Le=require("../ap-table/utils.js"),_e=require("../ap-table/hooks/use-table-paging-ng.js"),He=require("./hooks/use-row-selection.js"),je=require("./context.js"),$e=require("../ap-table/context.js"),B=require("../ap-grid/constants.js"),Je=require("@aplus-frontend/antdv/es/theme/internal"),Qe=require("./theme.js"),Xe=require("./hooks/use-columns.js"),Ye=require("./hooks/use-columns-def.js"),Ze=require("../utils/index.js"),eo=require("../utils/slot.js"),oo=require("./hooks/use-search-form.js");require("./components/empty/index.vue.js");const to=require("./hooks/use-virtual-config.js"),ro=require("./hooks/use-pinned-row.js"),no=require("./hooks/use-selection-col-def.js"),ao=require("../config-provider/hooks/use-namespace.js"),lo=require("../config-provider/hooks/use-global-config.js"),so=require("./components/empty/index.vue2.js"),uo=e.defineComponent({name:"AgGrid",__name:"index",props:{dropdownPrefixCls:{},bordered:{type:Boolean},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{},showSorterTooltip:{type:[Boolean,Object]},prefixCls:{},rowKey:{type:[String,Function],default:"key"},tableLayout:{},title:{},id:{},showHeader:{type:Boolean},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean]},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean},indentSize:{},expandIconColumnIndex:{},showExpandColumn:{type:Boolean},expandedRowClassName:{},childrenColumnName:{},rowExpandable:{},transformCellText:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean},params:{},request:{},defaultData:{},dataSource:{},onLoadingChange:{},onShownColumnsChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},wrapperStyle:{},tableStyle:{},manual:{type:Boolean,default:void 0},size:{default:"mini"},adaptive:{type:Boolean},columnResizable:{type:Boolean,default:!1},loading:{type:Boolean,default:void 0},summary:{},rowHeight:{},advanceRenderer:{type:Boolean},browserTooltips:{type:Boolean},virtual:{type:[Boolean,Object],default:void 0},onRowClicked:{},onScrollEnd:{},rowClassName:{},rowClassRules:{},autoHeight:{type:Boolean},onUpdate:{}},setup(J,{expose:Q}){j.ModuleRegistry.registerModules([j.AllCommunityModule]);const t=J,I=e.useSlots(),{e:R,b:i,be:X}=ao.useNamespace("ag-grid"),y=e.ref(t.size),Y=Qe.useTheme(y,e.toRef(t,"rowHeight")),Z=to.default(e.toRef(t,"virtual")),{rowPinnedGridConfig:E,getRowPinnedCellClass:ee}=ro.usePinnedRow(e.toRef(t,"summary")),oe=lo.useGlobalConfig("apGrid"),l=e.ref(),[,te]=Je.useToken();let f=!!t.dataSource;const T=oo.useSearchForm(t),{shownColumns:p,columns:D,columnKeys:re,getTargetColumnByKey:ne}=Xe.useColumns(t),{defaultColDef:ae,columnDefs:le,gridWrapperRef:se}=Ye.useColumnsDef(D,t,ee),b=e.ref({});je.useProvideSorter({sorter:b,setSorter(o){b.value=o}});const ue={asc:"ascend",desc:"descend"};function ie(){const o=l.value.getColumns()?.filter(c=>c.getSort()!==void 0),r=e.unref(b)||{};let n=o?.[0];const u=Object.keys(r);if(u.length&&u.every(c=>r[c]===null)){const c=Object.keys(r)[0];c&&(n=l.value?.getColumn(c))}if(!n)return;const s=n.getColDef(),S=n.getSort(),h=ne(s.colId);V(void 0,void 0,{column:s,field:h?.field??s.field??s.colId,order:S?ue[S]:null})}const ce=e.computed(()=>Le.recursionApColumns(e.unref(p),o=>{if(o.sorter===!0)return o.field??o.dataIndex??o.key}).filter(Boolean)),de=()=>{b.value={};const o=l.value;if(!o)return;const r=o.getColumnState()?.map(n=>({...n,sort:null}));o.applyColumnState({state:r})},fe=e.computed(()=>Ze.isDef(t.manual)?t.manual:eo.getValidVNodeList(I.searchFormExtra?.()||[]).some(r=>r.type?.name==="ApView")),{formRef:m,submit:k,reset:F,data:g,tableProps:z,handleTableChangeOptional:V,submitWith:P,refresh:K,getPaging:pe,setPaging:me,setDataSource:ge}=_e.useTablePaging({async request(o){if(f=!1,w.value&&!w.value.preserveSelectedRowKeys&&d.isUndefined(t.dataSource)&&q(),!d.isUndefined(t.dataSource)){const n=o.pageSize*(o.current-1);return{data:(t.pagination===!1?t.dataSource:t.dataSource.slice(n,n+o.pageSize))||[],total:t.dataSource.length||0}}const r=await t.request?.(o);return{data:r?.data||[],total:r?.total||0}},namespace:"ap-grid",filterFields:e.ref([]),params:e.toRef(t,"params"),defaultData:t.defaultData,manual:e.unref(fe),formatParams:t.beforeSearchSubmit,pagination:t.pagination,sortFields:ce,onClickReset:de}),w=e.computed(()=>{const o=t.rowSelection||oe.value?.rowSelection;if(o)return o===!0?B.DEFAULT_ROW_SELECTION_CONFIG:{...B.DEFAULT_ROW_SELECTION_CONFIG,...o}}),we=no.default(t,p),Se=e.computed(()=>d.isUndefined(t.dataSource)?g.records:t.dataSource),{select:ye,unSelect:Ce,selectedRows:x,selectedRowKeys:he,clearAll:ve,selectMultiByKeys:Re}=He.default({...w,dataSource:Se,rowKey:t.rowKey}),be={checkbox:"multiRow",radio:"singleRow"},Be=e.computed(()=>{const o=w.value;if(!o)return;const{type:r="checkbox",disabled:n}=o;return{mode:be[r],isRowSelectable:u=>n?!n(u.data):!0,hideDisabledCheckboxes:o.hideDisabled??!1}});function N(o){return d.isFunction(t.rowKey)?t.rowKey(o):o[t.rowKey]}const A=({api:o=l.value})=>{if(t.onUpdate?.(),!w.value)return;const r=x.value;if(!r.length){setTimeout(()=>{f=!0},0);return}f=!1;const n=[];o.forEachNode(u=>{const C=u.data,s=N(C);r.find(S=>N(S)===s)&&n.push(u)}),o.setNodesSelected({nodes:n,newValue:!0}),setTimeout(()=>{f=!0},0)},ke=o=>{f&&(o.node.isSelected()?ye(o.data):Ce(o.data),d.isFunction(w.value?.tooltip)&&o.api.refreshCells({rowNodes:[o.node],columns:["ag-Grid-SelectionColumn"],force:!0}))},Fe=()=>{f=!0},q=()=>{ve(),l.value?.deselectAll()};function xe(o){Re(o),e.nextTick(()=>{A({})})}function O(o=!1){const r=o?"getFieldsValueTransformed":"getFieldsValue";return m.value?.apForm?.[r]?.(!0)}function M(o){m.value?.apForm?.setFieldsValue?.(o)}function U(){return m.value?.getSorterItems()||[]}function G(o){m.value?.setSorterItems(o)}function W(){m.value?.resetSorterItems()}function L(o){return o&&String(o)}function Ne(o){const r=l.value;if(!r)return;const n=r.getColumnState()||[],u=o.map(a=>a.key?String(a.key):a.key).filter(Boolean),C=n.map(a=>{if(!re.value.includes(a.colId))return a;const v=!u.includes(a.colId),_={...a,hide:v},H=o.find(Me=>L(Me.key)===a.colId);return H&&(_.pinned=H.fixed||null),_}),s=new Map(o.map((a,v)=>[L(a.key),v])),S=C.filter(a=>s.has(a.colId)).sort((a,v)=>s.get(a.colId)-s.get(v.colId)),h=[];let c=0;for(const a of C)s.has(a.colId)?h.push(S[c++]):h.push(a);r.applyColumnState({state:h,applyOrder:!0})}$e.useProvideApTable({columns:e.computed(()=>p.value),columnsBackup:e.computed(()=>D.value),size:e.computed(()=>B.sizeMap[y.value]),updateColumns(o){p.value=o,t.onShownColumnsChange?.(o),Ne(o)},updateSize(o){y.value=B.sizeReverseMap[o]},renderConfig:e.computed(()=>({className:X("table-header","title"),color:te.value.colorTextTertiary})),dataSource:e.computed(()=>e.unref(g).records),getSearchFormValues:O,setSearchFormValues:M,submit:k,submitWith:P,reset:F,refresh:K,getSearchFormSorterItems:U,setSearchFormSorterItems:G,resetSearchFormSorterItems:W});const qe=e.computed(()=>d.isUndefined(t.loading)?g.loading:t.loading),Ie=e.computed(()=>[i(),t.card?null:i("wrapper"),i("adaptive"),i(`size-${y.value}`)].filter(Boolean)),Ee=e.computed(()=>({height:"100%",...t.tableStyle||{}})),Te=(o,r)=>{V({current:o,pageSize:r})};function De(o){const r=o.data;return N(r)}function ze(o,r){l.value?.ensureIndexVisible(o,r)}function Ve(o){t.onRowClicked?.(o.data,o.event)}function Pe(o){t.onScrollEnd?.(o.direction)}function Ke(o){return l.value?.refreshCells(o)}function Ae(o){return l.value?.redrawRows(o)}const Oe=o=>{const r=[E.value.getRowClass?.(o)];if(!o.node.rowPinned){const n=d.isFunction(t.rowClassName)?t.rowClassName(o.data,o.rowIndex):t.rowClassName;r.push(n)}return r.flat().filter(Boolean)};return e.watch(()=>t.dataSource,o=>{ge(o)},{immediate:!0,deep:!0}),e.watch(()=>t.size,o=>{y.value=o}),e.watch(()=>e.unref(g).loading,o=>{t.onLoadingChange?.(o)}),Q({submit:k,reset:F,refresh:K,submitWith:P,setSearchFormValues:M,getSearchFormValues:O,getShowColumns:()=>e.unref(p),rowSelection:{selectedRows:e.computed(()=>x.value),setSelectedRowKeys:xe,clearAll:q},scrollToRow:ze,getDataSource:()=>e.unref(g.records),getPaging:pe,setPaging:me,getSearchFormSorterItems:U,setSearchFormSorterItems:G,resetSearchFormSorterItems:W,refreshCells:Ke,redrawRows:Ae,_internalGridApi:e.computed(()=>l.value)}),(o,r)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(Ie.value),style:e.normalizeStyle(o.wrapperStyle)},[e.unref(d.isUndefined)(o.dataSource)&&o.searchForm!==!1&&e.unref(T).length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(o.card?e.unref(R)("search-wrapper"):null),style:e.normalizeStyle(o.searchFormWrapperStyle)},[e.createVNode(e.unref(We.ApForm).SearchForm,e.mergeProps(o.searchForm||{},{ref_key:"formRef",ref:m,"custom-reset":"","submit-loading":e.unref(z).loading,onSubmit:e.unref(k),onReset:e.unref(F)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(T),n=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.renderNode),{key:n.dataIndex}))),128))]),_:2},[I.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(o.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{class:e.normalizeClass([e.unref(R)("table-wrapper"),o.card?e.unref(R)("table-wrapper-card"):null]),style:e.normalizeStyle(o.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("header-wrapper"))},[e.renderSlot(o.$slots,"title",{selectedRows:e.unref(x),selectedRowKeys:e.unref(he),shownColumns:e.unref(p),clearAll:q})],2),e.createElementVNode("div",{ref_key:"gridWrapperRef",ref:se,class:e.normalizeClass(e.unref(i)("grid-wrapper"))},[e.createVNode(e.unref(Ue.AgGridVue),e.mergeProps(e.unref(Ge.mergeProps)(e.unref(Z),e.unref(E)),{"get-row-class":Oe,style:Ee.value,"row-data":e.unref(g).records,"column-defs":e.unref(le),"default-col-def":e.unref(ae),"suppress-loading-overlay":"","row-selection":Be.value,"selection-column-def":e.unref(we),"get-row-id":De,theme:e.unref(Y),"tooltip-show-delay":500,"enable-browser-tooltips":o.browserTooltips,"tooltip-interaction":"","row-class-rules":o.rowClassRules,"no-rows-overlay-component":so.default,"suppress-cell-focus":"","dom-layout":o.autoHeight?"autoHeight":"normal",onSortChanged:ie,onGridReady:r[0]||(r[0]=n=>l.value=n.api),onRowDataUpdated:A,onRowSelected:ke,onFirstDataRendered:Fe,onRowClicked:Ve,onBodyScrollEnd:Pe}),null,16,["style","row-data","column-defs","default-col-def","row-selection","selection-column-def","theme","enable-browser-tooltips","row-class-rules","dom-layout"]),e.withDirectives(e.createElementVNode("div",{class:e.normalizeClass(e.unref(R)("table-loading-wrapper"))},[e.createVNode(e.unref($.Spin),{delay:300})],2),[[e.vShow,qe.value]])],2),e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("pagination-wrapper"))},[o.pagination!==!1?(e.openBlock(),e.createBlock(e.unref($.Pagination),e.mergeProps({key:0,class:e.unref(i)("pagination")},e.unref(z).pagination,{onChange:Te}),null,16,["class"])):e.createCommentVNode("",!0)],2)],6)],6))}});exports.default=uo;

package/lib/src/ag-grid/interface.d.ts

@@ -119,6 +119,10 @@ export type AgGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>,
      * 行选择列自定义tooltip
      */
     tooltip?: string | ((checked: boolean, disabled: boolean, rowNode: IRowNode) => string | any);
+    /**
+     * 是否隐藏不可选中的元素
+     */
+    hideDisabled?: boolean;
 };
 export type AgGridVirtualConfig = {
     row?: boolean;

package/lib/src/ap-form/item/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("@aplus-frontend/antdv"),S=require("@aplus-frontend/antdv/es/theme/internal"),r=require("lodash-unified"),I=require("../constant.js"),T=require("@ant-design/icons-vue");require("../../config-provider/index.js");const _=require("../context.js"),z=require("@fruits-chain/utils"),M=require("../../utils/slot.js"),R=require("../../config-provider/hooks/use-namespace.js"),A=e.defineComponent({name:"ApFormItem",__name:"index",props:{htmlFor:{},prefixCls:{},label:{},help:{},extra:{},labelCol:{},wrapperCol:{},hasFeedback:{type:Boolean,default:!1},colon:{type:Boolean,default:void 0},labelAlign:{},prop:{},name:{},rules:{},autoLink:{type:Boolean,default:!0},required:{type:Boolean,default:void 0},validateFirst:{type:Boolean,default:void 0},validateStatus:{},validateTrigger:{},messageVariables:{},hidden:{type:Boolean},noStyle:{type:Boolean},tooltip:{},span:{},order:{},offset:{},push:{},pull:{},xs:{},sm:{},md:{},lg:{},xl:{},xxl:{},flex:{},bordered:{type:Boolean,default:!1},valuePropName:{default:"value"},initialValue:{},_signal:{},transform:{},description:{},customFilled:{},disabled:{type:Boolean}},setup(m,{expose:v}){const t=m,d=e.useSlots(),{model:f,updateModel:y,internalInstance:b}=_.useInjectForm(),{m:i,b:F}=R.useNamespace("ap-form-item"),s=e.ref(!1),l=e.ref(),[,V]=S.useToken();e.onMounted(async()=>{let o=r.isFunction(t.initialValue)?t.initialValue():t.initialValue;z.isPromise(o)&&(o=await o),b?.registerField({name:t.name,initialValue:r.cloneDeep(o),transform:t.transform})});const c=e.computed(()=>t.name?r.isArray(t.name)?t.name.reduce((o,n)=>o?.[n],e.unref(f)):f?.value[t.name]:null);function g(){const o=d.default?.()||[];if(!t.name)return o[0];const n=M.getValidVNodeList(o)[0];return n?e.cloneVNode(n,{[t.valuePropName]:e.unref(c),[`onUpdate:${t.valuePropName}`]:h,variant:t.bordered?"borderless":n?.props?.variant,onFocus:B,onBlur:C}):null}function h(o){y?.(t.name,o)}function B(){s.value=!0}function C(){s.value=!1}function x(){l.value?.onFieldBlur()}function q(){l.value?.onFieldChange()}function k(){l.value?.clearValidate()}function N(){l.value?.resetField()}function w(o=!1){const n=e.unref(c);if(!o||!t.transform)return n;const a=r.isFunction(t.transform)?t.transform:t.transform.transformer;return t.transform?a(n):n}return v({onFieldBlur:x,onFieldChange:q,clearValidate:k,resetField:N,getFieldValue:w}),(o,n)=>(e.openBlock(),e.createBlock(e.unref(u.Form).Item,e.mergeProps({ref_key:"formItemRef",ref:l},e.unref(r.omit)(t,[...e.unref(I.apFormItemColPropKeys),"tooltip","label","description"]),{class:{[e.unref(i)("bordered")]:o.bordered,[e.unref(i)("focused")]:o.bordered&&s.value,[e.unref(i)("disabled")]:o.bordered&&o.disabled,[e.unref(F)()]:!0},colon:o.bordered?!1:t.colon}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(g())))]),_:2},[t.tooltip?{name:"tooltip",fn:e.withCtx(({class:a})=>[e.createElementVNode("span",{class:e.normalizeClass(a)},[e.createVNode(e.unref(u.Tooltip),{title:t.tooltip},{default:e.withCtx(()=>[e.createVNode(e.unref(T.QuestionCircleOutlined),{style:e.normalizeStyle({color:e.unref(V).colorTextTertiary,fontSize:"14px",transform:"translateY(1px)"})},null,8,["style"])]),_:1},8,["title"])],2)]),key:"0"}:void 0,o.label?{name:"label",fn:e.withCtx(()=>[e.createVNode(e.unref(u.TypographyText),{content:o.label,ellipsis:{tooltip:o.label},style:{"min-width":"0px",flex:"1"}},null,8,["content","ellipsis"])]),key:"1"}:void 0,e.renderList(e.unref(r.omit)(d,"default"),(a,p)=>({name:p,fn:e.withCtx(P=>[e.renderSlot(o.$slots,p,e.normalizeProps(e.guardReactiveProps(P||{})))])}))]),1040,["class","colon"]))}});exports.default=A;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),u=require("@aplus-frontend/antdv"),S=require("@aplus-frontend/antdv/es/theme/internal"),n=require("lodash-unified"),I=require("../constant.js"),T=require("@ant-design/icons-vue");require("../../config-provider/index.js");const _=require("../context.js"),z=require("@fruits-chain/utils"),M=require("../../utils/slot.js"),R=require("../../config-provider/hooks/use-namespace.js"),A=e.defineComponent({name:"ApFormItem",__name:"index",props:{htmlFor:{},prefixCls:{},label:{},help:{},extra:{},labelCol:{},wrapperCol:{},hasFeedback:{type:Boolean,default:!1},colon:{type:Boolean,default:void 0},labelAlign:{},prop:{},name:{},rules:{},autoLink:{type:Boolean,default:!0},required:{type:Boolean,default:void 0},validateFirst:{type:Boolean,default:void 0},validateStatus:{},validateTrigger:{},messageVariables:{},hidden:{type:Boolean},noStyle:{type:Boolean},tooltip:{},span:{},order:{},offset:{},push:{},pull:{},xs:{},sm:{},md:{},lg:{},xl:{},xxl:{},flex:{},bordered:{type:Boolean,default:!1},valuePropName:{default:"value"},initialValue:{},_signal:{},transform:{},description:{},customFilled:{},disabled:{type:Boolean}},setup(m,{expose:v}){const t=m,d=e.useSlots(),{model:f,updateModel:b,internalInstance:y}=_.useInjectForm(),{m:i,b:F}=R.useNamespace("ap-form-item"),s=e.ref(!1),l=e.ref(),[,V]=S.useToken();e.onMounted(async()=>{let o=n.isFunction(t.initialValue)?t.initialValue():t.initialValue;z.isPromise(o)&&(o=await o),y?.registerField({name:t.name,initialValue:n.cloneDeep(o),transform:t.transform})});const c=e.computed(()=>t.name?n.isArray(t.name)?t.name.reduce((o,r)=>o?.[r],e.unref(f)):f?.value[t.name]:null);function g(){const o=d.default?.()||[];if(!t.name)return o[0];const r=M.getValidVNodeList(o)[0];return r?e.cloneVNode(r,{[t.valuePropName]:e.unref(c),[`onUpdate:${t.valuePropName}`]:h,variant:t.bordered?"borderless":r?.props?.variant,bordered:t.bordered?!1:r?.props?.bordered,onFocus:B,onBlur:C}):null}function h(o){b?.(t.name,o)}function B(){s.value=!0}function C(){s.value=!1}function x(){l.value?.onFieldBlur()}function q(){l.value?.onFieldChange()}function k(){l.value?.clearValidate()}function N(){l.value?.resetField()}function w(o=!1){const r=e.unref(c);if(!o||!t.transform)return r;const a=n.isFunction(t.transform)?t.transform:t.transform.transformer;return t.transform?a(r):r}return v({onFieldBlur:x,onFieldChange:q,clearValidate:k,resetField:N,getFieldValue:w}),(o,r)=>(e.openBlock(),e.createBlock(e.unref(u.Form).Item,e.mergeProps({ref_key:"formItemRef",ref:l},e.unref(n.omit)(t,[...e.unref(I.apFormItemColPropKeys),"tooltip","label","description"]),{class:{[e.unref(i)("bordered")]:o.bordered,[e.unref(i)("focused")]:o.bordered&&s.value,[e.unref(i)("disabled")]:o.bordered&&o.disabled,[e.unref(F)()]:!0},colon:o.bordered?!1:t.colon}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(g())))]),_:2},[t.tooltip?{name:"tooltip",fn:e.withCtx(({class:a})=>[e.createElementVNode("span",{class:e.normalizeClass(a)},[e.createVNode(e.unref(u.Tooltip),{title:t.tooltip},{default:e.withCtx(()=>[e.createVNode(e.unref(T.QuestionCircleOutlined),{style:e.normalizeStyle({color:e.unref(V).colorTextTertiary,fontSize:"14px",transform:"translateY(1px)"})},null,8,["style"])]),_:1},8,["title"])],2)]),key:"0"}:void 0,o.label?{name:"label",fn:e.withCtx(()=>[e.createVNode(e.unref(u.TypographyText),{content:o.label,ellipsis:{tooltip:o.label},style:{"min-width":"0px",flex:"1"}},null,8,["content","ellipsis"])]),key:"1"}:void 0,e.renderList(e.unref(n.omit)(d,"default"),(a,p)=>({name:p,fn:e.withCtx(P=>[e.renderSlot(o.$slots,p,e.normalizeProps(e.guardReactiveProps(P||{})))])}))]),1040,["class","colon"]))}});exports.default=A;

package/lib/src/business/hooks/useKeepAliveFlag.d.ts

@@ -1,6 +1,8 @@
 interface UseKeepAliveFlagOptions {
     /** 状态切换到deactivated时触发 */
     afterDeactivated?: () => void;
+    /** 状态切换到activated时触发 */
+    afterActivated?: () => void;
 }
 /**
  * 获取keepAliveFlag
@@ -10,5 +12,6 @@ export declare function useKeepAliveFlag(options?: UseKeepAliveFlagOptions): {
     isDeactivated: () => boolean;
     isActivated: () => boolean;
     registerAfterDeactivated: (fn: UseKeepAliveFlagOptions["afterDeactivated"]) => void;
+    registerAfterActivated: (fn: UseKeepAliveFlagOptions["afterActivated"]) => void;
 };
 export {};

package/lib/src/business/hooks/useKeepAliveFlag.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("vue");function c(i){let e="notKeepAlive",t=i?.afterDeactivated;return a.onActivated(()=>{e="activated"}),a.onDeactivated(()=>{e="deactivated",t?.()}),{isDeactivated:()=>e==="deactivated",isActivated:()=>e==="activated",registerAfterDeactivated:v=>{t=v}}}exports.useKeepAliveFlag=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("vue");function c(i){let e="notKeepAlive",r=i?.afterDeactivated,t=i?.afterActivated;return v.onActivated(()=>{t&&e==="deactivated"&&Promise.resolve().then(t),e="activated"}),v.onDeactivated(()=>{e="deactivated",r?.()}),{isDeactivated:()=>e==="deactivated",isActivated:()=>e==="activated",registerAfterDeactivated:a=>{r=a},registerAfterActivated:a=>{t=a}}}exports.useKeepAliveFlag=c;

package/lib/src/business/hooks/usePageListAgGrid.d.ts

@@ -1,4 +1,3 @@
-import { UseTableRefreshOption } from '..';
 import { AgGridExpose, AgGridProps } from '../../ag-grid';
 export interface UsePageListAgGrid extends AgGridProps {
     /** 是否显示默认的行选择配置
@@ -18,7 +17,7 @@ export interface UsePageListAgGrid extends AgGridProps {
     /**
      * 表格刷新相关
      */
-    tableRefresh?: boolean | Omit<UseTableRefreshOption, 'apTableRef'>;
+    tableRefresh?: boolean | (() => boolean);
     /** 是否需要在deactivated的时候清空数据
      * @default true
      */

package/lib/src/business/hooks/usePageListAgGrid.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../index.js");const i=require("lodash-unified"),b=require("vue"),q=require("./useKeepAliveFlag.js"),F=require("./useTableRefresh.js");function R(s){const r=b.ref(null),{isShowRowSelection:c=!0,clearSelectionOnRequest:d=!0,transformSearchFormValues:a,api:o,tableRefresh:f=!0,clearDataOnDeactivated:g=!0,...h}=s||{};let n=null;const u=()=>{r.value?.rowSelection?.clearAll()};F.useTableRefresh({...w(f),apTableRef:r});const l=e=>{r.value?.submitWith(e)},v=()=>{r.value?.reset()},{isDeactivated:S}=q.useKeepAliveFlag({afterDeactivated:l}),p=async e=>{if(S()&&g)return{data:[],total:0};n=e.sort;const t=a?a(e):e;if(!o)throw new Error("api is not defined");const{records:m,total:A}=await o(t);return d&&u(),{data:m,total:A}};return[i.merge({columnResizable:!0,request:o?p:void 0,rowSelection:c?{fixed:"left",columnWidth:38}:void 0,ref(e){r.value=e},card:!0},h),{reload:l,reset:v,getSearchFormValues:(e=!0)=>{const t=r.value?.getSearchFormValues(!!e)||{};return a?a(t):t},getAgGridInstance:()=>r.value,getSearchFormValuesAndSorted:(e=!0)=>{const t=r.value?.getSearchFormValues(!!e)||{};return t.sort=n&&i.cloneDeep(n),a?a(t):t},clearSelection:u}]}function w(s){return s===!0?{}:s===!1?{refreshBefore:()=>!1}:s}exports.usePageListAgGrid=R;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("lodash-unified"),F=require("vue"),q=require("./useKeepAliveFlag.js");function w(u){const r=F.ref(null),{isShowRowSelection:d=!0,clearSelectionOnRequest:f=!0,transformSearchFormValues:o,api:a,tableRefresh:s=!0,clearDataOnDeactivated:g=!0,...v}=u||{};let n=null;const l=()=>{r.value?.rowSelection?.clearAll()},i=e=>{r.value?.submitWith(e)},S=()=>{r.value?.reset()},{isDeactivated:h}=q.useKeepAliveFlag({afterActivated(){(c.isFunction(s)?s():s)&&i()},afterDeactivated:i}),p=async e=>{if(h()&&g)return{data:[],total:0};n=e.sort;const t=o?o(e):e;if(!a)throw new Error("api is not defined");const{records:m,total:A}=await a(t);return f&&l(),{data:m,total:A}};return[c.merge({columnResizable:!0,request:a?p:void 0,rowSelection:d?{fixed:"left",columnWidth:38}:void 0,ref(e){r.value=e},card:!0},v),{reload:i,reset:S,getSearchFormValues:(e=!0)=>{const t=r.value?.getSearchFormValues(!!e)||{};return o?o(t):t},getAgGridInstance:()=>r.value,getSearchFormValuesAndSorted:(e=!0)=>{const t=r.value?.getSearchFormValues(!!e)||{};return t.sort=n&&c.cloneDeep(n),o?o(t):t},clearSelection:l}]}exports.usePageListAgGrid=w;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.35.0";
+declare const _default: "6.35.2";
 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.35.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.35.2";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.35.0",
+  "version": "6.35.2",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -41,14 +41,14 @@
     "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
-    "@aplus-frontend/antdv": "^1.2.10",
+    "@aplus-frontend/antdv": "^1.2.11",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "vue": "^3.5.17",
     "vxe-table": "^4.13.37"
   },
   "devDependencies": {
-    "@aplus-frontend/antdv": "^1.2.10",
+    "@aplus-frontend/antdv": "^1.2.11",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "@types/sortablejs": "^1.15.8",

package/theme/ag-grid/index.css

@@ -713,3 +713,6 @@
        user-select: text;
   -webkit-user-select: text;
 }
+.aplus-ag-grid .ag-checkbox.ag-labeled[disabled] .ag-input-field-input[disabled] {
+  cursor: not-allowed;
+}

package/theme/ag-grid/index.less

@@ -164,4 +164,7 @@
     user-select: text;
     -webkit-user-select: text;
   }
+  .ag-checkbox.ag-labeled[disabled] .ag-input-field-input[disabled] {
+    cursor: not-allowed;
+  }
 });

package/theme/index.css

@@ -4423,6 +4423,9 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
        user-select: text;
   -webkit-user-select: text;
 }
+.aplus-ag-grid .ag-checkbox.ag-labeled[disabled] .ag-input-field-input[disabled] {
+  cursor: not-allowed;
+}
 .aplus-ap-value-select-card {
   position: relative;
   margin-top: 8px;