Skip to content

Commit 67b9c48

Browse files
authored
fix(grid): fix error of grid component and fix huicharts being packaged and excluded (#2994)
1 parent 378e573 commit 67b9c48

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

internals/cli/src/shared/module-utils.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@ export interface Module {
5151
* @returns 模块对象
5252
*/
5353
const getAllModules = (isSort: boolean) => {
54-
const callback = (item) => {
55-
return !item.path.split('/').includes('huicharts')
56-
}
57-
return getSortModules({ filterIntercept: callback, isSort })
54+
return getSortModules({ filterIntercept: () => true, isSort })
5855
}
5956

6057
/**

packages/vue/src/grid/src/grid/grid.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,12 @@ export default defineComponent({
373373
const props = { ...tableProps, optimization: optimizOpt, startIndex: seqIndex }
374374

375375
// 初始化 tooltip 配置
376-
props.tooltipConfig = Object.assign({}, GlobalConfig.tooltip || {}, designConfig.tooltip || {}, props.tooltipConfig || {})
376+
props.tooltipConfig = Object.assign(
377+
{},
378+
GlobalConfig.tooltip || {},
379+
designConfig?.tooltip || {},
380+
props.tooltipConfig || {}
381+
)
377382

378383
// 在用户没有配置stripe时读取design配置
379384
if (designConfig?.stripe !== undefined && !props.stripe) {

0 commit comments

Comments
 (0)