diff --git a/internals/cli/src/shared/module-utils.ts b/internals/cli/src/shared/module-utils.ts index 32bfd0530d..0a387d8258 100644 --- a/internals/cli/src/shared/module-utils.ts +++ b/internals/cli/src/shared/module-utils.ts @@ -51,10 +51,7 @@ export interface Module { * @returns 模块对象 */ const getAllModules = (isSort: boolean) => { - const callback = (item) => { - return !item.path.split('/').includes('huicharts') - } - return getSortModules({ filterIntercept: callback, isSort }) + return getSortModules({ filterIntercept: () => true, isSort }) } /** diff --git a/packages/vue/src/grid/src/grid/grid.ts b/packages/vue/src/grid/src/grid/grid.ts index 21dd0a220e..039e28f38a 100644 --- a/packages/vue/src/grid/src/grid/grid.ts +++ b/packages/vue/src/grid/src/grid/grid.ts @@ -373,7 +373,12 @@ export default defineComponent({ const props = { ...tableProps, optimization: optimizOpt, startIndex: seqIndex } // 初始化 tooltip 配置 - props.tooltipConfig = Object.assign({}, GlobalConfig.tooltip || {}, designConfig.tooltip || {}, props.tooltipConfig || {}) + props.tooltipConfig = Object.assign( + {}, + GlobalConfig.tooltip || {}, + designConfig?.tooltip || {}, + props.tooltipConfig || {} + ) // 在用户没有配置stripe时读取design配置 if (designConfig?.stripe !== undefined && !props.stripe) {