forked from opentiny/tiny-vue
fix(components): fix some bugs (#1148)
* fix(row): [layout] restore the gutter value, and add gutter demo (#1006) * fix(row): restore the gutter value, and add gutter demo * fix(row): fix e2e test * fix(dropdown): fix console warning (#1000) * fix(select): [select] Fixed an issue where a blank area is displayed when the select component uses the optimization attribute (#989) * docs(layout): fix gutter's default value (#1011) * build(internal): fix process not defined error (#991) * build(internal): fix process not defined error * build(internal): fix process not defined error * build(internal): fix process not defined error * Update transformVirtualTemplateForBuild.ts * fix(sites): demo fill the row when it is only one * fix(form): fix from valid tooltip background color (#1059) * fix(form): fix from valid tooltip background color (#1081) * build(theme): [theme] Add the index.less file package of the root directory (#1090) * fix(grid): [grid] update parentHeight before recalculate (#1142) --------- Co-authored-by: 申君健 <40288193@qq.com> Co-authored-by: gimmyhehe <975402925@qq.com> Co-authored-by: MomoPoppy <125256456+MomoPoppy@users.noreply.github.com> Co-authored-by: chenxi-20 <76168465+chenxi-20@users.noreply.github.com>
This commit is contained in:
parent
d865c0e340
commit
5709d26ee4
|
@ -41,7 +41,7 @@ export function transformVirtualTemplateForBuild(code: string) {
|
||||||
if (templateArr.length === 1) {
|
if (templateArr.length === 1) {
|
||||||
return `return ${key}`
|
return `return ${key}`
|
||||||
} else {
|
} else {
|
||||||
return `if ('${value}' === (process.env.TINY_MODE || mode)) {return ${key}}`
|
return `if ('${value}' === (tinyMode || mode)) {return ${key}}`
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.join('\n')
|
.join('\n')
|
||||||
|
@ -53,6 +53,9 @@ export function transformVirtualTemplateForBuild(code: string) {
|
||||||
${getImports(params)}
|
${getImports(params)}
|
||||||
|
|
||||||
const ${localName} = (mode) => {
|
const ${localName} = (mode) => {
|
||||||
|
|
||||||
|
const tinyMode = typeof process === 'object' ? process.env?.TINY_MODE : null
|
||||||
|
|
||||||
${getTemplateFunction(params)}
|
${getTemplateFunction(params)}
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
|
@ -119,10 +119,12 @@
|
||||||
|
|
||||||
&__valid {
|
&__valid {
|
||||||
&.@{tooltip-prefix-cls}.@{tooltip-prefix-cls}__popper {
|
&.@{tooltip-prefix-cls}.@{tooltip-prefix-cls}__popper {
|
||||||
// 华为云规范 12px 16px; 所以它直接按tooltip的默认值即可
|
.tooltip-validate-icon {
|
||||||
// padding: 7px 4px;
|
fill: var(--ti-tooltip-validate-icon-color);
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
&.is-error[x-placement^='top'] .popper__arrow {
|
&[x-placement^='top'] .popper__arrow {
|
||||||
bottom: -4px;
|
bottom: -4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -212,7 +212,7 @@ export default defineComponent({
|
||||||
popperClass: `${classPrefix}form__valid`,
|
popperClass: `${classPrefix}form__valid`,
|
||||||
arrowOffset: 0,
|
arrowOffset: 0,
|
||||||
adjustArrow: true,
|
adjustArrow: true,
|
||||||
type: 'error',
|
type: 'normal',
|
||||||
disabled: state.getValidateType !== 'tip',
|
disabled: state.getValidateType !== 'tip',
|
||||||
placement: validatePosition,
|
placement: validatePosition,
|
||||||
manual: true,
|
manual: true,
|
||||||
|
|
|
@ -1037,6 +1037,8 @@ const Methods = {
|
||||||
return this.recalculate()
|
return this.recalculate()
|
||||||
},
|
},
|
||||||
updateStyle() {
|
updateStyle() {
|
||||||
|
// 窗口resize后,手动调用recalculate父容器高度还是初始值,需要update一下
|
||||||
|
this.updateParentHeight()
|
||||||
let { columnStore, currentRow, height, maxHeight, minHeight, parentHeight, tableColumn } = this
|
let { columnStore, currentRow, height, maxHeight, minHeight, parentHeight, tableColumn } = this
|
||||||
let layoutList = ['header', 'body', 'footer']
|
let layoutList = ['header', 'body', 'footer']
|
||||||
let { customHeight, scaleToPx } = {}
|
let { customHeight, scaleToPx } = {}
|
||||||
|
|
Loading…
Reference in New Issue