From 08c3988ddf6257935cd1ed9ced6b867b02bf435e Mon Sep 17 00:00:00 2001 From: tianxin Date: Tue, 2 Jul 2024 18:04:56 -0700 Subject: [PATCH 1/4] =?UTF-8?q?tiny-engine=E5=AF=BC=E8=88=AA=E6=A0=8F?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-demo/registry.js | 10 +- packages/common/component/PluginPanel.vue | 2 +- .../design-core/assets/cancel-full-screen.svg | 42 ++--- packages/design-core/assets/clear.svg | 25 ++- packages/design-core/assets/down-arrow.svg | 12 ++ packages/design-core/assets/full-screen.svg | 42 ++--- packages/design-core/assets/generate-code.svg | 29 ++-- packages/design-core/assets/locked.svg | 22 +-- packages/design-core/assets/preview.svg | 24 +-- packages/design-core/assets/refresh.svg | 25 ++- packages/design-core/assets/save.svg | 24 +-- packages/design-core/assets/unlocked.svg | 22 +-- packages/design-core/assets/user-locked.svg | 26 ++-- packages/design-core/assets/user.svg | 12 ++ packages/design-core/src/init.js | 6 +- packages/layout/src/DesignSettings.vue | 6 +- packages/layout/src/DesignToolbars.vue | 17 ++- packages/layout/src/ToolbarCollapse.vue | 91 +++++++++++ packages/settings/styles/src/Main.vue | 5 +- .../components/classNamesContainer/index.vue | 4 +- packages/theme/common/base.less | 5 +- packages/theme/light/toolbar.less | 3 +- packages/theme/light/variable.less | 6 +- packages/toolbars/breadcrumb/src/Main.vue | 64 +++++--- packages/toolbars/collaboration/meta.js | 3 +- packages/toolbars/collaboration/src/Main.vue | 31 +++- packages/toolbars/fullscreen/meta.js | 3 +- packages/toolbars/fullscreen/src/Main.vue | 16 +- packages/toolbars/generate-vue/src/Main.vue | 38 +++-- packages/toolbars/lang/meta.js | 3 +- packages/toolbars/lang/src/Main.vue | 10 +- packages/toolbars/lock/meta.js | 3 +- packages/toolbars/lock/src/Main.vue | 3 +- packages/toolbars/logo/src/Main.vue | 16 +- packages/toolbars/refresh/meta.js | 3 +- packages/toolbars/refresh/src/Main.vue | 10 +- packages/toolbars/save/src/Main.vue | 143 +++++++++++++++--- packages/toolbars/setting/meta.js | 3 +- packages/toolbars/setting/src/Main.vue | 4 +- 39 files changed, 531 insertions(+), 282 deletions(-) create mode 100644 packages/design-core/assets/down-arrow.svg create mode 100644 packages/design-core/assets/user.svg create mode 100644 packages/layout/src/ToolbarCollapse.vue diff --git a/designer-demo/registry.js b/designer-demo/registry.js index 7da645f73..20ab9c667 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, @@ -65,16 +63,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 7aa6b7358..8f52157ba 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/design-core/src/init.js b/packages/design-core/src/init.js index 6120a6d0a..b125cb82d 100644 --- a/packages/design-core/src/init.js +++ b/packages/design-core/src/init.js @@ -16,8 +16,8 @@ import i18n from '@opentiny/tiny-engine-controller/js/i18n' import { initMonitor } from '@opentiny/tiny-engine-controller/js/monitor' import { injectGlobalComponents } from '@opentiny/tiny-engine-common' import { initHttp } from '@opentiny/tiny-engine-http' -import TinyThemeTool from '@opentiny/vue-theme/theme-tool' -import { tinySmbTheme } from '@opentiny/vue-theme/theme' // SMB 主题 +// import TinyThemeTool from '@opentiny/vue-theme/theme-tool' +// import { tinySmbTheme } from '@opentiny/vue-theme/theme' // SMB 主题 import { defineEntry, mergeRegistry } from '@opentiny/tiny-engine-entry' import App from './App.vue' import defaultRegistry from '../registry.js' @@ -41,7 +41,7 @@ const defaultLifeCycles = { initHttp({ env: import.meta.env }) // eslint-disable-next-line no-new - new TinyThemeTool(tinySmbTheme, 'smbtheme') // 初始化主题 + // new TinyThemeTool(tinySmbTheme, 'smbtheme') // 初始化主题 if (import.meta.env.VITE_ERROR_MONITOR === 'true' && import.meta.env.VITE_ERROR_MONITOR_URL) { initMonitor(import.meta.env.VITE_ERROR_MONITOR_URL) diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue index e8b4e17a3..9d8c93077 100644 --- a/packages/layout/src/DesignSettings.vue +++ b/packages/layout/src/DesignSettings.vue @@ -69,9 +69,9 @@ export default { } .tiny-tabs__content { flex: 1; - overflow-y: scroll; + overflow-y: auto; padding: 0; - margin-top: 0; + margin: 0 0 15px; } .tiny-tabs__item { color: var(--ti-lowcode-setting-panel-tabs-item-title-color); @@ -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 8e5968b57..0e713138e 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-controller' 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 hidesBar = [] const state = reactive({ showDeployBlock: false }) props.toolbars.forEach((item) => { if (item.align === 'right') { - rightBar.push(item) + item?.collapsed ? hidesBar.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, + hidesBar } } } @@ -104,9 +109,9 @@ export default { justify-content: center; align-items: center; vertical-align: middle; - width: 32px; - height: 32px; - border-radius: 6px; + width: 24px; + height: 24px; + 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..c1ee953df --- /dev/null +++ b/packages/layout/src/ToolbarCollapse.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/packages/settings/styles/src/Main.vue b/packages/settings/styles/src/Main.vue index 7fa8e8c57..d383ba7ea 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..0d5383dd5 100644 --- a/packages/toolbars/lang/meta.js +++ b/packages/toolbars/lang/meta.js @@ -3,5 +3,6 @@ export default { type: 'toolbars', title: 'lang', align: 'right', - icon: '' + icon: '', + collapsed: true } diff --git a/packages/toolbars/lang/src/Main.vue b/packages/toolbars/lang/src/Main.vue index 9ae4f17c8..6e07a37dc 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" > 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 98f056199..7de528e25 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 c2c0b9e42..f24ac3e0e 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(() => {