Compare commits

...

10 Commits

Author SHA1 Message Date
ajaxzheng e9f92a8336
Merge branch 'dev' into release-3.12.0 2024-01-04 09:30:37 +08:00
gimmyhehe 11b59c39ac
fix(grid): [grid] update parentHeight before recalculate (#1142) 2023-12-15 11:02:05 +08:00
chenxi-20 7fb4317d38
build(theme): [theme] Add the index.less file package of the root directory (#1090) 2023-12-11 14:54:39 +08:00
gimmyhehe 18e90ec163
fix(form): fix from valid tooltip background color (#1081) 2023-12-11 14:18:45 +08:00
gimmyhehe 1b57fd5722
fix(form): fix from valid tooltip background color (#1059) 2023-12-07 20:23:18 +08:00
gimmyhehe efeebbb6e2
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
2023-12-04 11:46:10 +08:00
申君健 5c9f7a632d
docs(layout): fix gutter's default value (#1011) 2023-12-04 10:06:18 +08:00
MomoPoppy 803532484c
fix(select): [select] Fixed an issue where a blank area is displayed when the select component uses the optimization attribute (#989) 2023-12-03 10:50:47 +08:00
gimmyhehe ccb2a7a4b0
fix(dropdown): fix console warning (#1000) 2023-12-03 10:48:59 +08:00
申君健 5cd9c06c71
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
2023-12-03 10:48:24 +08:00
2 changed files with 15 additions and 3 deletions

View File

@ -14,13 +14,12 @@ import { setSubitemAttrValue, setGlobalAttrValue, getClassName, getStyle, row }
export const api = ['state'] export const api = ['state']
export const renderless = (props, { computed, reactive, inject }, { parent }) => { export const renderless = (props, { computed, reactive }, { parent }) => {
const api = {} const api = {}
const state = reactive({ const state = reactive({
row: computed(() => api.row()), row: computed(() => api.row()),
style: computed(() => api.getStyle()), style: computed(() => api.getStyle()),
className: computed(() => api.getClassName()), className: computed(() => api.getClassName())
layout: inject('layout')
}) })
Object.assign(api, { Object.assign(api, {

View File

@ -98,6 +98,14 @@ const createTheme = (callbackFn) => {
return fs.existsSync(path) return fs.existsSync(path)
} }
const copyDir = (originPath, targetPath) => {
fsExtra.copy(originPath, targetPath, (err) => {
if (err) {
console.log(err)
}
})
}
const mkStat = (originPath, fileDir, type) => { const mkStat = (originPath, fileDir, type) => {
const statPath = `${originPath}/${fileDir}` const statPath = `${originPath}/${fileDir}`
const smbPath = `${originPath}/${smbThemeName}/${fileDir}` const smbPath = `${originPath}/${smbThemeName}/${fileDir}`
@ -116,6 +124,11 @@ const createTheme = (callbackFn) => {
} else { } else {
isFileExist(originPath, fileDir, type) isFileExist(originPath, fileDir, type)
} }
} else {
if (fileDir === 'index.less') {
copyDir(statPath, smbPath)
copyDir(statPath, auroraPath)
}
} }
} else { } else {
if (fileDir === 'index.less') { if (fileDir === 'index.less') {