Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync release-3.20.0 to dev #2716

Merged
merged 5 commits into from
Dec 30, 2024
Merged

sync release-3.20.0 to dev #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0325f07
fix(form): [form] fix validate icon shrink when text very long (#2663)
gimmyhehe Dec 18, 2024
c4366f7
chore: update fluent-editor version
kagol Dec 19, 2024
fb7690e
chore: update vue-fluent-editor version
kagol Dec 19, 2024
8290118
feat: add saas-common runtime (#2700)
zzcr Dec 26, 2024
d96ca3f
fix(runtime): fix the problem of simple-runtime relying on echarts, a…
zzcr Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions internals/cli/src/commands/build/build-entry-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,34 +62,33 @@ const notSimpleComponents = [
'Amount',
'Area',
'AsyncFlowchart',
'AutonaviMap',
'BaiduMap',
'BaseSelect',
'HuichartsAmap',
'HuichartsBmap',
'BulletinBoard',
'CascaderMobile',
'Chart',
'ChartBar',
'ChartBoxplot',
'ChartCandle',
'ChartCore',
'ChartFunnel',
'ChartGauge',
'ChartGraph',
'ChartHeatmap',
'ChartHistogram',
'ChartLine',
'ChartLiquidfill',
'ChartMap',
'ChartPie',
'ChartProcess',
'ChartRadar',
'ChartRing',
'ChartSankey',
'ChartScatter',
'ChartSunburst',
'ChartTree',
'ChartWaterfall',
'ChartWordcloud',
'Huicharts',
'HuichartsBar',
'HuichartsBoxplot',
'HuichartsCandle',
'HuichartsCore',
'HuichartsFunnel',
'HuichartsGauge',
'HuichartsGraph',
'HuichartsHeatmap',
'HuichartsHistogram',
'HuichartsLine',
'HuichartsLiquidfill',
'HuichartsMap',
'HuichartsPie',
'HuichartsProcess',
'HuichartsRadar',
'HuichartsRing',
'HuichartsSankey',
'HuichartsScatter',
'HuichartsSunburst',
'HuichartsTree',
'HuichartsWaterfall',
'HuichartsWordcloud',
'Company',
'Country',
'Crop',
Expand Down
14 changes: 11 additions & 3 deletions internals/cli/src/commands/build/build-runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function batchBuildAll({ vueVersion, tasks, message, emptyOutDir, npmScope
if (tasks.length === 0) return
logGreen(`====== 开始构建 ${message} ======`)

const { mode } = tasks[0]
const { mode, libPath } = tasks[0]

const modeList = ['pc', 'mobile', 'mobile-first']

Expand All @@ -57,7 +57,8 @@ async function batchBuildAll({ vueVersion, tasks, message, emptyOutDir, npmScope
dtsInclude: [] as string[],
dts: false,
npmScope,
isRuntime: true
isRuntime: true,
design: libPath === 'tiny-vue-saas-common' ? 'saas' : null
} as BaseConfig) as UserConfig

baseConfig.define = Object.assign(baseConfig.define || {}, {
Expand Down Expand Up @@ -119,6 +120,9 @@ async function batchBuildAll({ vueVersion, tasks, message, emptyOutDir, npmScope
external: (source, importer, isResolved) => {
if (isResolved || !importer) return false

if (libPath === 'tiny-vue-saas-common') {
return ['@vue/composition-api', 'vue'].includes(source)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure that adding libPath as a condition for external dependencies does not unintentionally exclude necessary modules for other libPath values.

}
return Object.keys(getExternal()).includes(source)
},
output: {
Expand Down Expand Up @@ -161,6 +165,10 @@ function getEntryTasks() {
path: 'vue-common/src/index.ts',
libPath: 'tiny-vue-common'
},
{
path: 'vue-saas-common/src/index.ts',
libPath: 'tiny-vue-saas-common'
},
{
path: 'vue-runtime/all.ts',
libPath: 'tiny-vue-all'
Expand Down Expand Up @@ -232,7 +240,7 @@ export async function buildRuntime({
const processor = await createProcessor(
{
'--output': path.join(outDir, 'tailwind.css'),
'--content': path.join(outDir, 'tiny-vue.mjs')
'--content': path.join(outDir, 'tiny-vue-all.mjs')
},
path.resolve(rootDir, 'theme-saas/tailwind.config.js')
)
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@opentiny/vue-theme",
"type": "module",
"version": "3.20.0",
"version": "3.20.1",
"description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
"author": "OpenTiny Team",
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions packages/theme/src/form-item/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
.validate-icon {
fill: var(--tv-FormItem-icon-color-error);
margin-right: 4px;
flex-shrink: 0;
}
.@{form-item-prefix-cls}__validate-message {
vertical-align: middle;
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@opentiny/vue-runtime",
"type": "module",
"version": "3.20.0",
"version": "3.20.4",
"description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
"author": "OpenTiny Team",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/fluent-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/vue-fluent-editor",
"version": "3.20.1",
"version": "3.20.2",
"description": "",
"license": "MIT",
"sideEffects": false,
Expand All @@ -11,7 +11,7 @@
"//postversion": "pnpm build"
},
"dependencies": {
"@opentiny/fluent-editor": "~3.23.0",
"@opentiny/fluent-editor": "^3.24.0",
"@opentiny/vue-common": "workspace:~",
"@opentiny/vue-icon": "workspace:~",
"@opentiny/vue-image-viewer": "workspace:~",
Expand Down
Loading