diff --git a/designer-demo/registry.js b/designer-demo/registry.js index 560518447..5d505f6a1 100644 --- a/designer-demo/registry.js +++ b/designer-demo/registry.js @@ -14,7 +14,6 @@ import { Breadcrumb, Fullscreen, Lang, - Checkinout, Logo, Media, Redoundo, @@ -24,7 +23,6 @@ import { GenerateVue, Refresh, Collaboration, - Setting, Materials, Data, Script, @@ -76,16 +74,14 @@ export default { Logo, Breadcrumb, Media, + Redoundo, Collaboration, Clean, + Preview, Refresh, - Save, GenerateVue, - Preview, - Redoundo, + Save, Fullscreen, - Checkinout, - Setting, Lang ], plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, Data, Schema, Help, Robot], diff --git a/packages/common/component/PluginPanel.vue b/packages/common/component/PluginPanel.vue index 2574cbd15..7783f1b12 100644 --- a/packages/common/component/PluginPanel.vue +++ b/packages/common/component/PluginPanel.vue @@ -71,7 +71,7 @@ export default { justify-content: space-between; align-items: center; line-height: 48px; - font-size: 14px; + font-size: 12px; font-weight: var(--ti-lowcode-plugin-panel-title-font-weight); font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; diff --git a/packages/design-core/assets/cancel-full-screen.svg b/packages/design-core/assets/cancel-full-screen.svg index f2ae2e9f2..d80b981c7 100644 --- a/packages/design-core/assets/cancel-full-screen.svg +++ b/packages/design-core/assets/cancel-full-screen.svg @@ -1,32 +1,12 @@ - - - - - - - - + + + Created with Pixso. + + + + + + + - - - - - \ No newline at end of file + diff --git a/packages/design-core/assets/clear.svg b/packages/design-core/assets/clear.svg index 8619e2169..e0fb1c7d3 100644 --- a/packages/design-core/assets/clear.svg +++ b/packages/design-core/assets/clear.svg @@ -1,13 +1,12 @@ - - - ic_eraser_lined - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/down-arrow.svg b/packages/design-core/assets/down-arrow.svg new file mode 100644 index 000000000..a006c37b6 --- /dev/null +++ b/packages/design-core/assets/down-arrow.svg @@ -0,0 +1,12 @@ + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/full-screen.svg b/packages/design-core/assets/full-screen.svg index 71f2eb1c4..3d8a81f82 100644 --- a/packages/design-core/assets/full-screen.svg +++ b/packages/design-core/assets/full-screen.svg @@ -1,30 +1,12 @@ - - - 操作/全屏 - - - - - - - - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/generate-code.svg b/packages/design-core/assets/generate-code.svg index 2c78583a1..9ef86cf4b 100644 --- a/packages/design-core/assets/generate-code.svg +++ b/packages/design-core/assets/generate-code.svg @@ -1,17 +1,12 @@ - - - 操作/下载 - - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/locked.svg b/packages/design-core/assets/locked.svg index dc8a8ebba..dab711e5a 100644 --- a/packages/design-core/assets/locked.svg +++ b/packages/design-core/assets/locked.svg @@ -1,10 +1,12 @@ - - - ic_locked_lined - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/preview.svg b/packages/design-core/assets/preview.svg index da9964e73..26554a1b6 100644 --- a/packages/design-core/assets/preview.svg +++ b/packages/design-core/assets/preview.svg @@ -1,12 +1,12 @@ - - - 操作/播放1 - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/refresh.svg b/packages/design-core/assets/refresh.svg index 762d72dc5..b3a1b75c7 100644 --- a/packages/design-core/assets/refresh.svg +++ b/packages/design-core/assets/refresh.svg @@ -1,13 +1,12 @@ - - - 操作/刷新 2 - - - - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/save.svg b/packages/design-core/assets/save.svg index 157897bd8..497b32268 100644 --- a/packages/design-core/assets/save.svg +++ b/packages/design-core/assets/save.svg @@ -1,12 +1,12 @@ - - - 操作/保存 - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/unlocked.svg b/packages/design-core/assets/unlocked.svg index 79e990f69..bb3ff8104 100644 --- a/packages/design-core/assets/unlocked.svg +++ b/packages/design-core/assets/unlocked.svg @@ -1,10 +1,12 @@ - - - ic_lock_open_lined - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/user-locked.svg b/packages/design-core/assets/user-locked.svg index c7b0b4683..f3020646e 100644 --- a/packages/design-core/assets/user-locked.svg +++ b/packages/design-core/assets/user-locked.svg @@ -1,14 +1,12 @@ - - - 编组 7备份 - - - - - - - - - - - \ No newline at end of file + + + Created with Pixso. + + + + + + + + + diff --git a/packages/design-core/assets/user.svg b/packages/design-core/assets/user.svg new file mode 100644 index 000000000..53a1e31e0 --- /dev/null +++ b/packages/design-core/assets/user.svg @@ -0,0 +1,12 @@ + + + Created with Pixso. + + + + + + + + + diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue index 43fb6ce34..f344494d9 100644 --- a/packages/layout/src/DesignSettings.vue +++ b/packages/layout/src/DesignSettings.vue @@ -69,7 +69,7 @@ export default { } .tiny-tabs__content { flex: 1; - overflow-y: scroll; + overflow-y: auto; padding: 0; margin: 0; } @@ -85,7 +85,7 @@ export default { } :deep(.tiny-collapse-item__content) { - padding: 8px 16px; + padding: 8px 8px 8px 12px; } } diff --git a/packages/layout/src/DesignToolbars.vue b/packages/layout/src/DesignToolbars.vue index 644ba96c3..902181201 100644 --- a/packages/layout/src/DesignToolbars.vue +++ b/packages/layout/src/DesignToolbars.vue @@ -8,6 +8,7 @@
+
@@ -19,10 +20,12 @@ import { reactive, nextTick } from 'vue' import { useLayout } from '@opentiny/tiny-engine-meta-register' import { ProgressBar } from '@opentiny/tiny-engine-common' +import ToolbarCollapse from './ToolbarCollapse.vue' export default { components: { - ProgressBar + ProgressBar, + ToolbarCollapse }, props: { toolbars: { @@ -34,13 +37,14 @@ export default { const leftBar = [] const rightBar = [] const centerBar = [] + const collapseBar = [] const state = reactive({ showDeployBlock: false }) props.toolbars.forEach((item) => { if (item.align === 'right') { - rightBar.push(item) + item?.collapsed ? collapseBar.push(item) : rightBar.push(item) } else if (item.align === 'center') { centerBar.push(item) } else { @@ -61,7 +65,8 @@ export default { leftBar, rightBar, centerBar, - state + state, + collapseBar } } } @@ -104,9 +109,9 @@ export default { justify-content: center; align-items: center; vertical-align: middle; - width: 32px; - height: 32px; - border-radius: 6px; + width: 26px; + height: 26px; + border-radius: 4px; position: relative; svg { cursor: pointer; diff --git a/packages/layout/src/ToolbarCollapse.vue b/packages/layout/src/ToolbarCollapse.vue new file mode 100644 index 000000000..1838f3aa2 --- /dev/null +++ b/packages/layout/src/ToolbarCollapse.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/packages/settings/styles/src/Main.vue b/packages/settings/styles/src/Main.vue index 4fe909cee..c8df17eda 100644 --- a/packages/settings/styles/src/Main.vue +++ b/packages/settings/styles/src/Main.vue @@ -205,16 +205,17 @@ export default { + diff --git a/packages/toolbars/lang/meta.js b/packages/toolbars/lang/meta.js index 59f9cf628..0c2659ad1 100644 --- a/packages/toolbars/lang/meta.js +++ b/packages/toolbars/lang/meta.js @@ -3,5 +3,7 @@ export default { type: 'toolbars', title: 'lang', align: 'right', - icon: '' + icon: '', + collapsed: true, + splitLine: true } diff --git a/packages/toolbars/lang/src/Main.vue b/packages/toolbars/lang/src/Main.vue index 9ae4f17c8..3008fc6b7 100644 --- a/packages/toolbars/lang/src/Main.vue +++ b/packages/toolbars/lang/src/Main.vue @@ -5,11 +5,15 @@ popper-class="toolbar-right-popover" append-to-body content="画布中英文切换" + :disabled="true" > @@ -41,6 +45,11 @@ export default { langVal.value = data.value }) + const langSvgIconNameMap = { + zh_CN: 'cn', + en_US: 'en' + } + const options = [ { value: 'zh_CN', @@ -58,7 +67,8 @@ export default { return { options, langVal, - changeLang + changeLang, + langSvgIconNameMap } } } diff --git a/packages/toolbars/lock/meta.js b/packages/toolbars/lock/meta.js index 0cf04b939..31b874b4b 100644 --- a/packages/toolbars/lock/meta.js +++ b/packages/toolbars/lock/meta.js @@ -3,5 +3,6 @@ export default { title: 'lock', type: 'toolbars', icon: '', - align: 'right' + align: 'right', + collapsed: true } diff --git a/packages/toolbars/lock/src/Main.vue b/packages/toolbars/lock/src/Main.vue index cae795ffc..b8539c3d0 100644 --- a/packages/toolbars/lock/src/Main.vue +++ b/packages/toolbars/lock/src/Main.vue @@ -6,9 +6,10 @@ popper-class="toolbar-right-popover" append-to-body :content="statusMessageMap[state.status]?.nextOptName" + :disabled="true" > diff --git a/packages/toolbars/logo/src/Main.vue b/packages/toolbars/logo/src/Main.vue index a3fbe7404..f2ef0634a 100644 --- a/packages/toolbars/logo/src/Main.vue +++ b/packages/toolbars/logo/src/Main.vue @@ -3,7 +3,6 @@

- {{ state.appName }}

@@ -312,7 +311,8 @@ onUnmounted(() => {