diff --git a/src/control/grid/grid/grid-control.util.ts b/src/control/grid/grid/grid-control.util.ts index b8d78cdc59fdff15822ab33e554a708d884f0c84..d1aa1648f7b46808bf0674c20fb8f5fc93b00409 100644 --- a/src/control/grid/grid/grid-control.util.ts +++ b/src/control/grid/grid/grid-control.util.ts @@ -238,8 +238,11 @@ export function useAppGridBase( }; const defaultSort = computed(() => { + const fieldColumn = Object.values(c.fieldColumns).find( + item => item.model.appDEFieldId === c.model.minorSortAppDEFieldId, + ); return { - prop: c.model.minorSortAppDEFieldId, + prop: fieldColumn?.model.codeName, order: c.model.minorSortDir?.toLowerCase() === 'desc' ? 'descending' diff --git a/src/control/grid/grid/grid.tsx b/src/control/grid/grid/grid.tsx index d7646235ea8991b6d3ba1e5d197fd86474c2cf12..7d2f9a6b938135f41ac523c4801e9c2645ece6c8 100644 --- a/src/control/grid/grid/grid.tsx +++ b/src/control/grid/grid/grid.tsx @@ -2,8 +2,6 @@ import { useControlController, useNamespace } from '@ibiz-template/vue3-util'; import { defineComponent, h, - onMounted, - onUnmounted, PropType, resolveComponent, VNode, @@ -162,32 +160,6 @@ export const GridControl = defineComponent({ const { renderPopover } = useRowEditPopover(tableRef, c); - const setSortFiled = () => { - if (!tableRef.value) { - return; - } - const { prop, order } = defaultSort.value; - const fieldColumn = Object.values(c.fieldColumns).find( - item => item.model.appDEFieldId === prop, - ); - if (fieldColumn) { - tableRef.value.store.commit('sort', { - prop: fieldColumn.model.codeName, - order, - init: true, - }); - c.evt.off('onLoadSuccess', setSortFiled); - } - }; - - onMounted(() => { - c.evt.on('onLoadSuccess', setSortFiled); - }); - - onUnmounted(() => { - c.evt.off('onLoadSuccess', setSortFiled); - }); - return { c, ns, @@ -209,6 +181,9 @@ export const GridControl = defineComponent({ }; }, render() { + if (!this.c.state.isCreated) { + return; + } const state = this.c.state; const { hideHeader, enablePagingBar } = this.c.model; return ( @@ -250,15 +225,14 @@ export const GridControl = defineComponent({ width='55' > ), - state.isCreated && - this.renderColumns.map((model, index) => { - return renderChildColumn( - this.c, - model, - this.renderColumns, - index, - ); - }), + this.renderColumns.map((model, index) => { + return renderChildColumn( + this.c, + model, + this.renderColumns, + index, + ); + }), ]; }, append: () => {