From 28a67f75073f81106b9fe5d1b0fa626bedd4e006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=80=A1=E6=9E=97?= Date: Tue, 5 Mar 2024 17:41:16 +0800 Subject: [PATCH] Fix some bugs (#1465) * feat(drawer): fit x-design theme * feat(drawer): add demo and api document for 'tipsProps' * fix(docs): optimize api type anchor * fix(build): optimize build:theme script * docs(timeline): api document optimization * docs(steps): api document optimization * fix(pull-refresh): solved the problem pull down can't reset data * fix(build:theme): solved running build:theme script error --- examples/sites/demos/apis/time-line.js | 2 +- examples/sites/demos/pc/app/steps/click-composition-api.vue | 2 +- .../demos/pc/app/steps/line-horizontal-composition-api.vue | 2 +- examples/sites/demos/pc/app/steps/line-horizontal.vue | 2 +- .../demos/pc/app/steps/line-vertical-composition-api.vue | 2 +- examples/sites/demos/pc/app/steps/line-vertical.vue | 2 +- packages/renderless/src/pull-refresh/vue.ts | 6 ++---- packages/theme/src/form/smb-theme.js | 6 ++++-- packages/theme/src/index.less | 1 + 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/examples/sites/demos/apis/time-line.js b/examples/sites/demos/apis/time-line.js index cec075eb2..da5f9b76b 100644 --- a/examples/sites/demos/apis/time-line.js +++ b/examples/sites/demos/apis/time-line.js @@ -56,7 +56,7 @@ export default { type: 'string | number', defaultValue: '', desc: { - 'zh-CN': "连接线长度，仅当 text-position 取值为 'right' 时生效，设置后 space 属性失效。", + 'zh-CN': "连接线长度，仅当 text-position 取值为 'right' 时生效，设置后 space 属性失效", 'en-US': "The length of the connection line and it is valid only when text-position is set to 'right'. After setting, the space property is invalid" }, diff --git a/examples/sites/demos/pc/app/steps/click-composition-api.vue b/examples/sites/demos/pc/app/steps/click-composition-api.vue index 666c3d70f..401a96978 100644 --- a/examples/sites/demos/pc/app/steps/click-composition-api.vue +++ b/examples/sites/demos/pc/app/steps/click-composition-api.vue @@ -6,7 +6,7 @@ diff --git a/examples/sites/demos/pc/app/steps/line-horizontal.vue b/examples/sites/demos/pc/app/steps/line-horizontal.vue index a133ef440..a8fe9260c 100644 --- a/examples/sites/demos/pc/app/steps/line-horizontal.vue +++ b/examples/sites/demos/pc/app/steps/line-horizontal.vue @@ -29,7 +29,7 @@ export default { advancedClick(index, node) { this.advancedActive = index - Modal.message(`节点index: ${index}; 节点信息: ${JSON.stringify(node)}.`) + Modal.message({ message: `节点index: ${index}; 节点信息: ${JSON.stringify(node)}.`, status: 'info' }) } } } diff --git a/examples/sites/demos/pc/app/steps/line-vertical-composition-api.vue b/examples/sites/demos/pc/app/steps/line-vertical-composition-api.vue index 8ea4a51f4..f7131efce 100644 --- a/examples/sites/demos/pc/app/steps/line-vertical-composition-api.vue +++ b/examples/sites/demos/pc/app/steps/line-vertical-composition-api.vue @@ -26,6 +26,6 @@ const data = reactive([ const advancedClick = (index, node) => { active.value = index - Modal.message(`节点index: ${index}; 节点信息: ${JSON.stringify(node)}.`) + Modal.message({ message: `节点index: ${index}; 节点信息: ${JSON.stringify(node)}.`, status: 'info' }) } diff --git a/examples/sites/demos/pc/app/steps/line-vertical.vue b/examples/sites/demos/pc/app/steps/line-vertical.vue index f8ca8ba1b..528ee211f 100644 --- a/examples/sites/demos/pc/app/steps/line-vertical.vue +++ b/examples/sites/demos/pc/app/steps/line-vertical.vue @@ -33,7 +33,7 @@ export default { advancedClick(index, node) { this.active = index - Modal.message(`节点index: ${index}; 节点信息: ${JSON.stringify(node)}.`) + Modal.message({ message: `节点index: ${index}; 节点信息: ${JSON.stringify(node)}.`, status: 'info' }) } } } diff --git a/packages/renderless/src/pull-refresh/vue.ts b/packages/renderless/src/pull-refresh/vue.ts index 812c42e17..7b0ce42d3 100644 --- a/packages/renderless/src/pull-refresh/vue.ts +++ b/packages/renderless/src/pull-refresh/vue.ts @@ -65,10 +65,8 @@ export const renderless = (props, { watch, onMounted, reactive, onBeforeUnmount watch( () => props.hasMore, - (value) => { - if (!value) { - state.hasMore = false - } + (value: boolean) => { + state.hasMore = value }, { immediate: true } ) diff --git a/packages/theme/src/form/smb-theme.js b/packages/theme/src/form/smb-theme.js index bfa85088b..31ebf1222 100644 --- a/packages/theme/src/form/smb-theme.js +++ b/packages/theme/src/form/smb-theme.js @@ -1,5 +1,7 @@ export const tinyFormSmbTheme = { 'ti-form-item-label-top-margin-bottom': '24px', - 'ti-form-item-label-top-label-line-height': '1.5', // smb要求行高为1.5 - 'ti-form-item-label-top-label-height': 'calc(1.5em + 8px)' // border-box需要加上内边距 + // smb要求行高为1.5 + 'ti-form-item-label-top-label-line-height': '1.5', + // border-box需要加上内边距 + 'ti-form-item-label-top-label-height': 'calc(1.5em + 8px)' } diff --git a/packages/theme/src/index.less b/packages/theme/src/index.less index 29e988324..d3144623b 100644 --- a/packages/theme/src/index.less +++ b/packages/theme/src/index.less @@ -74,6 +74,7 @@ @import './file-upload/index.less'; @import './filter-box/index.less'; @import './filter-panel/index.less'; +@import './float-button/index.less'; @import './floatbar/index.less'; @import './flowchart/index.less'; @import './form/index.less';