From 1380f4e931b639e0f2868f8808effd547b3370cc Mon Sep 17 00:00:00 2001 From: Kagol Date: Fri, 2 Feb 2024 14:29:41 +0800 Subject: [PATCH] merge release-3.13.0 to dev (#1365) * fix(pager): [pager] change pager content to unicode (#1251) * fix(build): fix build error and update versions * fix(build): update theme version * fix(vue): [grid] fix show icon condition (#1259) * docs(grid): [grid] fix grid docs (#1260) * docs(grid): [grid] fix grid docs * docs(grid): [grid] fix grid docs * fix(vue-common): fix process env error (#1277) * fix(vue-common): fix process env error * fix(vue-common): fix process env error * fix(vue-common): fix process env error * fix(modal): fix modal process env error * fix(select): [dialog-box, select] fix select async emit form validate (#1292) * fix(theme): x-design style css var fix (#1286) * fix(renderless): fix popper fixed offset in transform parent (#1332) * fix(vue): [cascader] fix search mode in wujie (#1319) * fix(theme): [grid] fix xDesign grid toolbar button style (#1357) * fix(tree-menu): [tree-menu] Fix the issue of asynchronous loading of tree-menu component (#1362) --------- Co-authored-by: gimmyhehe <975402925@qq.com> Co-authored-by: zzcr <894103554@qq.com> Co-authored-by: wuyiping0628 <42107997+wuyiping0628@users.noreply.github.com> --- .../pc/app/tree-menu/webdoc/tree-menu.js | 2 +- packages/renderless/src/cascader/index.ts | 12 +++++------ packages/renderless/src/tree-menu/index.ts | 4 ++-- packages/theme/src/grid/smb-theme.js | 6 +++++- packages/theme/src/grid/toolbar.less | 10 +++++----- packages/theme/src/grid/vars.less | 20 ++++++++++++++++++- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/examples/sites/demos/pc/app/tree-menu/webdoc/tree-menu.js b/examples/sites/demos/pc/app/tree-menu/webdoc/tree-menu.js index e4311a46d..64f423a3c 100644 --- a/examples/sites/demos/pc/app/tree-menu/webdoc/tree-menu.js +++ b/examples/sites/demos/pc/app/tree-menu/webdoc/tree-menu.js @@ -467,7 +467,7 @@ export default { 'zh-CN': '自定义获取服务端数据源的方法，返回一个 Promise 对象', 'en-US': 'Customize the method for obtaining server-side data sources and return a Promise object' }, - 'demoId': 'get-menu-data-sync' + 'demoId': 'data-resource' }, { 'name': 'indent', diff --git a/packages/renderless/src/cascader/index.ts b/packages/renderless/src/cascader/index.ts index bb8565834..2612cbbcb 100644 --- a/packages/renderless/src/cascader/index.ts +++ b/packages/renderless/src/cascader/index.ts @@ -421,9 +421,7 @@ export const calcCollapseTags = const tags: HTMLDivElement[] = Array.from(content.querySelectorAll('.tiny-tag')) let { total, dom, idx } = { total: collapseTagWidth as number, dom: null as HTMLDivElement | null, idx: 0 } - - // eslint-disable-next-line array-callback-return - tags.some((tag, index) => { + tags.forEach((tag, index) => { if (tag !== tagsLength) { const { width: tagContentWidth, marginRight, marginLeft } = tag && window.getComputedStyle(tag) total += parseFloat(tagContentWidth) + parseFloat(marginRight) + parseFloat(marginLeft) @@ -618,10 +616,10 @@ export const updateStyle = const tags = $el.querySelector(CASCADER.TagClass) let suggestionPanelEl: HTMLDivElement | null = null - // eslint-disable-next-line no-cond-assign - if (suggestionPanel && (suggestionPanelEl = suggestionPanel.$el)) { - const suggestionList: HTMLDivElement | null = suggestionPanelEl?.querySelector(CASCADER.ListClass) - suggestionList && (suggestionList.style.minWidth = inputInner.offsetWidth + 'px') + if (suggestionPanel) { + suggestionPanelEl = suggestionPanel.$el + const suggestionList: HTMLDivElement | null = suggestionPanelEl.querySelector(CASCADER.ListClass) + suggestionList.style.minWidth = inputInner.offsetWidth + 'px' } if (tags) { diff --git a/packages/renderless/src/tree-menu/index.ts b/packages/renderless/src/tree-menu/index.ts index 7269476d8..fb2da51b7 100644 --- a/packages/renderless/src/tree-menu/index.ts +++ b/packages/renderless/src/tree-menu/index.ts @@ -13,14 +13,14 @@ import type { ITreeMenuApi, ITreeMenuState, ITreeMenuProps, ITreeMenuData, ITree export const initData = ({ state, props, service, api }: { state: ITreeMenuState; props: ITreeMenuProps; service: any; api: ITreeMenuApi }) => - () => { + async () => { if (props.data) { state.data = props.data return } if (typeof service.getMenuDataSync === 'function') { - const menuData = service.getMenuDataSync() + const menuData = await service.getMenuDataSync() state.data = api.setMenuKey({ newData: [], menuData }) } diff --git a/packages/theme/src/grid/smb-theme.js b/packages/theme/src/grid/smb-theme.js index 00f0ac2e6..13e175489 100644 --- a/packages/theme/src/grid/smb-theme.js +++ b/packages/theme/src/grid/smb-theme.js @@ -19,5 +19,9 @@ export const tinyGridSmbTheme = { 'ti-grid-icon-color': 'var(--ti-common-color-icon)', 'ti-grid-checkbox-icon-size': 'var(--ti-common-font-size-2)', 'ti-grid-checkbox-bg-color-checked': '#1476FF', - 'ti-grid-radio-bg-color-checked': '#1476FF' + 'ti-grid-radio-bg-color-checked': '#1476FF', + 'ti-grid-toolbar-btn-height': 'var(--ti-common-size-8x, 32px)', + 'ti-grid-toolbar-btn-width': 'var(--ti-common-size-8x, 32px)', + 'ti-grid-toolbar-btn-border-color': 'var(--ti-common-color-line-normal, #c2c2c2)', + 'ti-grid-toolbar-btn-border-radius': 'calc(var(--ti-common-size-base, 4px) + 2px)' } diff --git a/packages/theme/src/grid/toolbar.less b/packages/theme/src/grid/toolbar.less index 56a08b965..c2101237a 100644 --- a/packages/theme/src/grid/toolbar.less +++ b/packages/theme/src/grid/toolbar.less @@ -84,11 +84,11 @@ .@{grid-refresh-prefix-cls}__wrapper, .@{grid-custom-prefix-cls}__wrapper { float: right; - width: 30px; - height: 30px; - line-height: 30px; - border: solid 1px var(--ti-grid-border-color); - border-radius: 3px; + width: var(--ti-grid-toolbar-btn-width); + height: var(--ti-grid-toolbar-btn-height); + line-height: var(--ti-grid-toolbar-btn-height); + border: solid 1px var(--ti-grid-toolbar-btn-border-color); + border-radius: var(--ti-grid-toolbar-btn-border-radius); text-align: center; margin: 0 4px; display: flex; diff --git a/packages/theme/src/grid/vars.less b/packages/theme/src/grid/vars.less index 9b9e7b58e..ef11423ad 100644 --- a/packages/theme/src/grid/vars.less +++ b/packages/theme/src/grid/vars.less @@ -12,7 +12,16 @@ .component-css-vars-grid() { // 表格默认字体 - --ti-grid-font-family: var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei'); + --ti-grid-font-family: var( + --ti-common-font-family, + 'Helvetica', + 'Arial', + 'PingFangSC-Regular', + 'Hiragino Sans GB', + 'Microsoft YaHei', + '微软雅黑', + 'Microsoft JhengHei' + ); // 默认表头文本色 --ti-grid-header-text-color: var(--ti-common-color-info-normal, #252b3a); // 默认表体文本色 @@ -152,4 +161,13 @@ --ti-grid-column-icon-scale-size: 1; // 表格无数据背景图片 --ti-table-nodata-td-bg-img-url: url('data:image/png;base64,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'); + + // 工具栏按钮高度 + --ti-grid-toolbar-btn-height: calc(var(--ti-common-size-7x, 28px) + 2px); + // 工具栏按钮宽度 + --ti-grid-toolbar-btn-width: calc(var(--ti-common-size-7x, 28px) + 2px); + // 工具栏按钮边框色 + --ti-grid-toolbar-btn-border-color: var(--ti-common-color-line-dividing, #dfe1e6); + // 工具栏按钮边框圆角 + --ti-grid-toolbar-btn-border-radius: calc(var(--ti-common-size-base, 4px) - 1px); }