diff --git a/package.json b/package.json index 823ce54bf..af2d9e7d9 100644 --- a/package.json +++ b/package.json @@ -3,17 +3,13 @@ "private": true, "scripts": { "preinstall": "npx only-allow pnpm", - "dev": "pnpm run setup && concurrently 'pnpm:serve:backend' 'pnpm:dev:demo:frontend'", - "dev:mock": "pnpm --filter @opentiny/tiny-engine dev", - "dev:demo": "pnpm run setup && concurrently 'pnpm:serve:backend' 'pnpm:dev:demo:frontend'", + "dev": "pnpm run setup && concurrently 'pnpm:serve:backend' 'pnpm:serve:frontend'", "serve:frontend": "pnpm --filter designer-demo dev", - "dev:demo:frontend": "pnpm --filter designer-demo dev", "serve:backend": "pnpm --filter @opentiny/tiny-engine-mock dev", "build:plugin": "pnpm --filter @opentiny/tiny-engine-* --filter @opentiny/tiny-engine build", "build:alpha": "pnpm --filter designer-demo build:alpha", "build:prod": "pnpm --filter designer-demo build", "buildComponentSchemas": "node scripts/buildComponentSchemas.js", - "preview": "pnpm --filter @opentiny/tiny-engine preview", "lint": "eslint . --ext .js,.vue,.jsx --fix", "format": "prettier --write **/*{.vue,.js,.ts,.html,.json}", "prepare": "node -e \"if(require('fs').existsSync('.git')){process.exit(1)}\" || husky install", diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue index 0c97ce569..9d5caceb7 100644 --- a/packages/common/component/MetaCodeEditor.vue +++ b/packages/common/component/MetaCodeEditor.vue @@ -2,7 +2,9 @@
- {{ value === '' ? buttonLabel : value }} + {{ + value === '' ? buttonLabel : value + }}
@@ -298,7 +300,7 @@ export default { justify-content: space-between; align-items: center; width: 100%; - height: 32px; + height: 24px; padding: 4px; border: 1px solid var(--ti-lowcode-meta-codeEditor-border-color); border-radius: 6px; @@ -322,6 +324,10 @@ export default { color: var(--ti-lowcode-common-text-main-color); } } + +.text-line-clamp { + -webkit-line-clamp: 1; +} :deep(.tiny-dialog-box__header) { padding-bottom: 15px; } diff --git a/packages/common/component/VueMonaco.vue b/packages/common/component/VueMonaco.vue index f7bf86d6d..c2e661330 100644 --- a/packages/common/component/VueMonaco.vue +++ b/packages/common/component/VueMonaco.vue @@ -211,23 +211,3 @@ export default { } } - diff --git a/packages/configurator/src/color-configurator/ColorConfigurator.vue b/packages/configurator/src/color-configurator/ColorConfigurator.vue index 42542c7c3..d4e32ce47 100644 --- a/packages/configurator/src/color-configurator/ColorConfigurator.vue +++ b/packages/configurator/src/color-configurator/ColorConfigurator.vue @@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@ + + diff --git a/packages/design-core/assets/style-panel-collapsed.svg b/packages/design-core/assets/style-panel-collapsed.svg new file mode 100644 index 000000000..4909844dd --- /dev/null +++ b/packages/design-core/assets/style-panel-collapsed.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/packages/design-core/assets/style-panel-expand.svg b/packages/design-core/assets/style-panel-expand.svg new file mode 100644 index 000000000..90ed6ec7b --- /dev/null +++ b/packages/design-core/assets/style-panel-expand.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue index 993ef02a7..8ad765762 100644 --- a/packages/layout/src/DesignSettings.vue +++ b/packages/layout/src/DesignSettings.vue @@ -2,10 +2,15 @@
- +
+
+ + + +
@@ -29,10 +34,14 @@ export default { const { layoutState } = useLayout() const activating = computed(() => layoutState.settings.activating) const showMask = ref(true) + const isCollapsed = ref(false) + const settingIcon = computed(() => (isCollapsed.value ? 'style-panel-collapsed' : 'style-panel-expand')) return { showMask, + isCollapsed, activating, + settingIcon, layoutState } } @@ -49,12 +58,23 @@ export default { padding-top: 12px; background-color: var(--ti-lowcode-setting-panel-bg-color); + .tabs-setting { + position: absolute; + top: 9px; + right: 18px; + line-height: 26px; + color: var(--te-common-icon-secondary); + cursor: pointer; + } .tiny-tabs { height: 100%; } :deep(.tiny-tabs) { display: flex; flex-direction: column; + .tiny-tabs__header .tiny-tabs__nav { + width: 60%; + } .tiny-tabs__nav-scroll { margin-left: 12px; .tiny-tabs__active-bar { @@ -69,10 +89,14 @@ export default { padding: 0; margin: 0; } + .tiny-tabs__nav.is-show-active-bar .tiny-tabs__item { + margin-right: 8px; + } .tiny-tabs__item { flex: 1; background-color: var(--ti-lowcode-setting-panel-bg-color); color: var(--ti-lowcode-setting-panel-tabs-item-title-color); + margin-right: 5px; &:hover { color: var(--ti-lowcode-setting-panel-tabs-item-title-hover-color); } diff --git a/packages/plugins/state/src/CreateStore.vue b/packages/plugins/state/src/CreateStore.vue index a09a3d633..168f4b401 100644 --- a/packages/plugins/state/src/CreateStore.vue +++ b/packages/plugins/state/src/CreateStore.vue @@ -258,7 +258,7 @@ export default { :deep(.toolbar) { position: absolute; z-index: 99; - right: 4px; + right: 20px; } .stores { padding: 12px; diff --git a/packages/plugins/state/src/CreateVariable.vue b/packages/plugins/state/src/CreateVariable.vue index 4614d61fc..100f2d96e 100644 --- a/packages/plugins/state/src/CreateVariable.vue +++ b/packages/plugins/state/src/CreateVariable.vue @@ -416,7 +416,7 @@ export default { :deep(.toolbar) { position: absolute; z-index: 99; - right: 4px; + right: 20px; } .var { padding: 12px; diff --git a/packages/settings/styles/src/Main.vue b/packages/settings/styles/src/Main.vue index fd0a038cf..2ac04daea 100644 --- a/packages/settings/styles/src/Main.vue +++ b/packages/settings/styles/src/Main.vue @@ -27,7 +27,7 @@
- + @@ -65,7 +65,7 @@ diff --git a/packages/settings/styles/src/components/typography/TypographyGroup.vue b/packages/settings/styles/src/components/typography/TypographyGroup.vue index ee508b26b..9d6c5ac13 100644 --- a/packages/settings/styles/src/components/typography/TypographyGroup.vue +++ b/packages/settings/styles/src/components/typography/TypographyGroup.vue @@ -1,26 +1,17 @@