Skip to content

Commit

Permalink
Merge branch 'refactor/develop' into release-v2.2.0-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@hexqi
hexqi committed Jan 26, 2025
2 parents 3452517 + 5b9d61a commit 1edcfad
Show file tree
Hide file tree
Showing 188 changed files with 930 additions and 2,286 deletions.
12 changes: 6 additions & 6 deletions designer-demo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"@opentiny/tiny-engine-theme-dark": "workspace:*",
"@opentiny/tiny-engine-theme-light": "workspace:*",
"@opentiny/tiny-engine-utils": "workspace:*",
"@opentiny/vue": "~3.14.0",
"@opentiny/vue-design-smb": "~3.14.0",
"@opentiny/vue-icon": "~3.14.0",
"@opentiny/vue-locale": "~3.14.0",
"@opentiny/vue-renderless": "~3.14.0",
"@opentiny/vue-theme": "~3.14.0",
"@opentiny/vue": "~3.20.0",
"@opentiny/vue-design-smb": "~3.20.0",
"@opentiny/vue-icon": "~3.20.0",
"@opentiny/vue-locale": "~3.20.0",
"@opentiny/vue-renderless": "~3.20.0",
"@opentiny/vue-theme": "~3.20.0",
"@vueuse/core": "^9.6.0",
"vue": "^3.4.21"
},
Expand Down
12 changes: 6 additions & 6 deletions designer-demo/public/mock/bundle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4803,10 +4803,10 @@
"npm": {
"package": "@opentiny/vue",
"exportName": "Layout",
"version": "3.14.0",
"version": "3.20.0",
"destructuring": true,
"script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs",
"css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css"
"script": "https://unpkg.com/@opentiny/vue-runtime@~3.20/dist3/tiny-vue-pc.mjs",
"css": "https://unpkg.com/@opentiny/vue-theme@~3.20/index.css"
},
"group": "component",
"priority": 5,
Expand Down Expand Up @@ -14040,10 +14040,10 @@
{
"name": "TinyVue组件库",
"package": "@opentiny/vue",
"version": "3.14.0",
"version": "3.20.0",
"destructuring": true,
"script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs",
"css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css"
"script": "https://unpkg.com/@opentiny/vue-runtime@~3.20/dist3/tiny-vue-pc.mjs",
"css": "https://unpkg.com/@opentiny/vue-theme@~3.20/index.css"
},
{
"name": "element-plus组件库",
Expand Down
10 changes: 5 additions & 5 deletions mockServer/src/mock/get/app-center/v1/apps/schema/918.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1923,7 +1923,7 @@
"package": "@opentiny/vue",
"exportName": "Checkbox",
"destructuring": true,
"version": "3.14.0"
"version": "3.20.0"
},
{
"componentName": "TinySelect",
Expand Down Expand Up @@ -1986,28 +1986,28 @@
"package": "@opentiny/vue",
"exportName": "Collapse",
"destructuring": true,
"version": "3.14.0"
"version": "3.20.0"
},
{
"componentName": "TinyCollapseItem",
"package": "@opentiny/vue",
"exportName": "CollapseItem",
"destructuring": true,
"version": "3.14.0"
"version": "3.20.0"
},
{
"componentName": "TinyBreadcrumb",
"package": "@opentiny/vue",
"exportName": "Breadcrumb",
"destructuring": true,
"version": "3.14.0"
"version": "3.20.0"
},
{
"componentName": "TinyBreadcrumbItem",
"package": "@opentiny/vue",
"exportName": "BreadcrumbItem",
"destructuring": true,
"version": "3.14.0"
"version": "3.20.0"
},
{
"componentName": "ElInput",
Expand Down
12 changes: 6 additions & 6 deletions packages/block-compiler/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>block-compiler</title>
<link rel="stylesheet" href="https://unpkg.com/@opentiny/vue-theme@3.14/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@opentiny/vue-theme@3.20/index.css" />
<script type="importmap">
{
"imports": {
Expand All @@ -19,11 +19,11 @@
"@opentiny/tiny-engine-i18n-host": "https://unpkg.com/@opentiny/tiny-engine-i18n-host@1/dist/lowcode-design-i18n-host.es.js",
"@opentiny/tiny-engine-builtin-component": "https://unpkg.com/@opentiny/tiny-engine-builtin-component@^2.0.0/dist/index.js",
"pinia": "https://unpkg.com/[email protected]/dist/pinia.esm-browser.js",
"@opentiny/vue": "https://unpkg.com/@opentiny/vue@3.14/runtime/tiny-vue.mjs",
"@opentiny/vue-icon": "https://unpkg.com/@opentiny/vue@3.14/runtime/tiny-vue-icon.mjs",
"@opentiny/vue-common": "https://unpkg.com/@opentiny/vue@3.14/runtime/tiny-vue-common.mjs",
"@opentiny/vue-locale": "https://unpkg.com/@opentiny/vue@3.14/runtime/tiny-vue-locale.mjs",
"@opentiny/vue-renderless/": "https://unpkg.com/@opentiny/vue-renderless@3.14/"
"@opentiny/vue": "https://unpkg.com/@opentiny/vue-runtime@3.20/dist3/tiny-vue-pc.mjs",
"@opentiny/vue-icon": "https://unpkg.com/@opentiny/vue-runtime@3.20/dist3/tiny-vue-icon.mjs",
"@opentiny/vue-common": "https://unpkg.com/@opentiny/vue-runtime@3.20/dist3/tiny-vue-common.mjs",
"@opentiny/vue-locale": "https://unpkg.com/@opentiny/vue-runtime@3.20/dist3/tiny-vue-locale.mjs",
"@opentiny/vue-renderless/": "https://unpkg.com/@opentiny/vue-renderless@3.20/"
}
}
</script>
Expand Down
6 changes: 3 additions & 3 deletions packages/blockToWebComponentTemplate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"dependencies": {
"@opentiny/tiny-engine-i18n-host": "workspace:*",
"@opentiny/tiny-engine-webcomponent-core": "workspace:*",
"@opentiny/vue": "~3.14.0",
"@opentiny/vue-icon": "~3.14.0",
"@opentiny/vue-theme": "~3.14.0",
"@opentiny/vue": "~3.20.0",
"@opentiny/vue-icon": "~3.20.0",
"@opentiny/vue-theme": "~3.20.0",
"@vue/shared": "^3.3.11",
"vue": "^3.4.15",
"vue-i18n": "^9.9.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/build/vite-config/src/canvas-dev-external.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ export function canvasDevExternal(override = {}) {
const blockRequire = {
externals: [/^@opentiny\/vue$/, /^@opentiny\/vue-icon$/],
imports: {
'@opentiny/vue': `${prefix}/node_modules/@opentiny/vue/runtime/tiny-vue.mjs`,
'@opentiny/vue-icon': `${prefix}/node_modules/@opentiny/vue/runtime/tiny-vue-icon.mjs`
'@opentiny/vue': `${prefix}/node_modules/@opentiny/vue-runtime/dist3/tiny-vue-pc.mjs`,
'@opentiny/vue-icon': `${prefix}/node_modules/@opentiny/vue-runtime/dist3/tiny-vue-icon.mjs`
},
importStyles: [`${prefix}/node_modules/@opentiny/vue-theme/index.css`]
}
// 以下内容由于物料协议不支持声明子依赖而@opentiny/vue需要依赖所以需要补充
const tinyVueRequire = {
imports: {
'@opentiny/vue-common': `${prefix}/node_modules/@opentiny/vue/runtime/tiny-vue-common.mjs`,
'@opentiny/vue-locale': `${prefix}/node_modules/@opentiny/vue/runtime/tiny-vue-locale.mjs`
'@opentiny/vue-common': `${prefix}/node_modules/@opentiny/vue-runtime/dist3/tiny-vue-common.mjs`,
'@opentiny/vue-locale': `${prefix}/node_modules/@opentiny/vue-runtime/dist3/tiny-vue-locale.mjs`
}
}
return [
Expand Down
4 changes: 2 additions & 2 deletions packages/build/vite-config/src/localCdnFile/copyPreviewImportMap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function extraPreviewImport(filename, originCdnPrefix) {
const result = []
const importMap = readJsonSync(filename)
Object.entries(importMap.imports)?.forEach(([_key, location]) => {
const url = location.replace('${VITE_CDN_DOMAIN}', originCdnPrefix).replace('${opentinyVueVersion}', '~3.14')
const url = location.replace('${VITE_CDN_DOMAIN}', originCdnPrefix).replace('${opentinyVueVersion}', '~3.20')
if (url?.startsWith(originCdnPrefix) && !result.includes(url)) {
result.push(url)
}
Expand All @@ -29,7 +29,7 @@ export function replacePreviewImport(importMap, fileMap, originCdnPrefix) {
imports: Object.fromEntries(
Object.entries(importMap.imports)?.map(([key, location]) => {
// 这里的替换占位符规则等同于packages/design-core/src/preview/src/preview/importMap.js, 两边修改需要同步
const url = location.replace('${VITE_CDN_DOMAIN}', originCdnPrefix).replace('${opentinyVueVersion}', '~3.14')
const url = location.replace('${VITE_CDN_DOMAIN}', originCdnPrefix).replace('${opentinyVueVersion}', '~3.20')
const matchRule = fileMap.find((rule) => url === rule.originUrl)
if (matchRule) {
return [key, matchRule.newUrl]
Expand Down
11 changes: 6 additions & 5 deletions packages/canvas/DesignCanvas/src/importMap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export function getImportMapData(overrideVersions = {}, canvasDeps = { scripts:
const importMapVersions = Object.assign(
{
vue: '3.4.23',
tinyVue: '~3.14',
tinyVue: '~3.20',
vueI18n: '^9.9.0'
},
overrideVersions
Expand All @@ -13,8 +13,8 @@ export function getImportMapData(overrideVersions = {}, canvasDeps = { scripts:
// 以下内容由于区块WebComponent加载需要补充
const blockRequire = {
imports: {
'@opentiny/vue': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue.mjs`,
'@opentiny/vue-icon': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-icon.mjs`,
'@opentiny/vue': `${VITE_CDN_DOMAIN}/@opentiny/vue-runtime@${importMapVersions.tinyVue}/dist3/tiny-vue-pc.mjs`,
'@opentiny/vue-icon': `${VITE_CDN_DOMAIN}/@opentiny/vue-runtime@${importMapVersions.tinyVue}/dist3/tiny-vue-icon.mjs`,
'element-plus': `${VITE_CDN_DOMAIN}/[email protected]/dist/index.full.mjs`,
'@opentiny/tiny-engine-builtin-component': `${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component@^2.0.0/dist/index.mjs`
},
Expand All @@ -27,8 +27,9 @@ export function getImportMapData(overrideVersions = {}, canvasDeps = { scripts:
// 以下内容由于物料协议不支持声明子依赖而@opentiny/vue需要依赖所以需要补充
const tinyVueRequire = {
imports: {
'@opentiny/vue-common': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-common.mjs`,
'@opentiny/vue-locale': `${VITE_CDN_DOMAIN}/@opentiny/vue@${importMapVersions.tinyVue}/runtime/tiny-vue-locale.mjs`
'@opentiny/vue-common': `${VITE_CDN_DOMAIN}/@opentiny/vue-runtime@${importMapVersions.tinyVue}/dist3/tiny-vue-common.mjs`,
'@opentiny/vue-locale': `${VITE_CDN_DOMAIN}/@opentiny/vue-runtime@${importMapVersions.tinyVue}/dist3/tiny-vue-locale.mjs`,
echarts: `${VITE_CDN_DOMAIN}/[email protected]/dist/echarts.esm.js`
}
}

Expand Down
14 changes: 7 additions & 7 deletions packages/canvas/container/src/components/CanvasAction.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
>
<shortCutPopover v-if="showPopover" @active="activeSetting('props')"></shortCutPopover>
<template #reference>
<icon-setting class="icon-setting" @click.stop="showPopover = !showPopover"></icon-setting>
<icon-setting class="icon-setting svg-currentcolor" @click.stop="showPopover = !showPopover"></icon-setting>
</template>
</TinyPopover>
</div>
Expand Down Expand Up @@ -71,25 +71,25 @@
<div v-if="showAction" ref="optionRef" class="corner-mark-right" :style="fixStyle">
<template v-if="!isModal">
<div v-if="showToParent" title="选择父级">
<icon-chevron-left @click.stop="selectParent"></icon-chevron-left>
<icon-chevron-left class="svg-currentcolor" @click.stop="selectParent"></icon-chevron-left>
</div>
<div title="向上移动">
<icon-arrow-up @click.stop="moveUp"></icon-arrow-up>
<icon-arrow-up class="svg-currentcolor" @click.stop="moveUp"></icon-arrow-up>
</div>
<div title="向下移动">
<icon-arrow-down @click.stop="moveDown"></icon-arrow-down>
<icon-arrow-down class="svg-currentcolor" @click.stop="moveDown"></icon-arrow-down>
</div>
<div title="复制">
<icon-copy @click.stop="copy"></icon-copy>
<icon-copy class="svg-currentcolor" @click.stop="copy"></icon-copy>
</div>
</template>
<template v-else>
<div title="隐藏">
<icon-eyeclose @click.stop="hide"></icon-eyeclose>
<icon-eyeclose class="svg-currentcolor" @click.stop="hide"></icon-eyeclose>
</div>
</template>
<div title="删除">
<icon-del @click.stop="remove"></icon-del>
<icon-del class="svg-currentcolor" @click.stop="remove"></icon-del>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/canvas/container/src/components/CanvasDivider.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export default {
width: 24px;
height: 24px;
border-radius: 50%;
background-color: var(--ti-lowcode-common-text-color-3);
background-color: var(--te-common-bg-default);
cursor: pointer;
z-index: 3;
&.divider-vertical {
Expand All @@ -223,7 +223,7 @@ export default {
.divider {
width: 12px;
height: 12px;
color: var(--ti-lowcode-common-text-color-3);
color: var(--te-base-gray-0);
background-size: contain;
background-repeat: no-repeat;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAGKADAAQAAAABAAAAGAAAAADiNXWtAAACO0lEQVRIDa2Uy6tNURzHN7cwMUAmHncot0QeV5QiBgZKmWEgzDDx+ANu5soMcUkxIY+iEFIKEZnIyMC9GZAMrke6hXt9Pvus1VnntPbZ53B/9dnrt36P7zpr7bVPUTRtD+5j+Arv4QwshDpbTIG1o2CvGmq12CVmk/ADnsGnMHccgCpbRiLWjuA/BTXUUrM0VzNwD+aVkcbjIMNveJnEUrePyWuYgP1JYi6+WmqWO3FLrpqKMy3tHE8LtzemLc99ITfcEm1MXERNtYsxcGs520nQBV61JWcyHw253W25OFVzbDqPj1D1MheF6tWM24LvcAD6w7yqdwF5tYvT4K90y6m5zQ/wE37BC9Bmw2f4Ah6DNdamFo/vlEHP3pvwB87CLjgGNrrwEbgY/K2MQ8E/zHg0+NbaY68aaqmpdmlLeT4HBSPf8RXQloA3ylvzDTx/34OmsLWxz9Hdqtlivo/l4NXy1syB1C4ziSK547THXjXU6tk20uECnn1fz91dNJynJu5gUxf1PZV4nr6DdzABj2BK7Rpq/votcDX4GxinxNagovjDoOZLdBcPwvy/h/souMDaROlGiK1PYv/kbg5C19u6V4b43bZ4z1M/GF/uQKbzFjF3NpjJdRXaEQQuVFQr7AK3K/Idw36Jb2Ec+jtU3iHnIqs61GRTe4naeDKbbQbXhbqbzVC9N4OSEfAPbD7UmbfMa7uirjDmD+H464/HQM3oB2f9lVxd7l9vFoVv4ESuIRN7QkzxaZlc8RcdnI7tMHZBlAAAAABJRU5ErkJggg==);
Expand Down
6 changes: 3 additions & 3 deletions packages/canvas/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
"vite": "^5.4.2"
},
"peerDependencies": {
"@opentiny/vue": "^3.14.0",
"@opentiny/vue-icon": "^3.14.0",
"@opentiny/vue-renderless": "^3.14.0",
"@opentiny/vue": "^3.20.0",
"@opentiny/vue-icon": "^3.20.0",
"@opentiny/vue-renderless": "^3.20.0",
"vue": "^3.4.15",
"vue-i18n": "^9.9.0"
}
Expand Down
79 changes: 0 additions & 79 deletions packages/common/component/BlockHistoryTemplate.vue
View file

This file was deleted.

6 changes: 3 additions & 3 deletions packages/common/component/BlockLinkEvent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,22 @@ export default {
padding: 3px 0;
border: 1px solid var(--ti-lowcode-tabs-border-color);
border-radius: 3px;
background-color: var(--ti-lowcode-toolbar-view-hover-bg);
background-color: var(--te-common-bg-container);
box-shadow: 0 1px 15px 0 rgb(0 0 0 / 20%);
display: flex;
flex-direction: column;
.menu-item {
font-size: 12px;
display: flex;
justify-content: space-between;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
padding: 6px 15px;
&:not(:last-child) {
border-bottom: 1px solid var(--ti-lowcode-tabs-border-color);
}
&:hover {
color: var(--ti-lowcode-toolbar-icon-color);
background: var(--ti-lowcode-canvas-wrap-bg);
background: var(--te-common-bg-container);
}

.link-item {
Expand Down
Loading

0 comments on commit 1edcfad

Please sign in to comment.