Merge branch 'refactor/develop' of https://github.com/betterdancing/t…

…iny-engine into refactor/style-panel
betterdancing · Oct 31, 2024 · a964715 · a964715
2 parents aa8e61f + d283c5a
commit a964715
Show file tree

Hide file tree

Showing 81 changed files with 284 additions and 120 deletions.
diff --git a/designer-demo/package.json b/designer-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "type": "module",
   "scripts": {
     "dev": "cross-env VITE_THEME=light vite",

diff --git a/mockServer/package.json b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "type": "module",

diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-config",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "",
   "type": "module",
   "main": "./index.js",

diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "",
   "type": "module",
   "main": "dist/index.cjs",

diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

diff --git a/packages/canvas/package.json b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue
@@ -518,7 +518,7 @@ export default {
   justify-content: space-between;
   position: relative;
   align-items: center;
-  padding-bottom: 8px;
+  padding-bottom: var(--te-common-vertical-item-spacing-normal);
   &:last-child {
     padding-bottom: 0;
   }

diff --git a/packages/common/component/MetaChildItem.vue b/packages/common/component/MetaChildItem.vue
@@ -93,15 +93,19 @@ export default {
   color: var(--te-common-text-primary);
   padding: 0 10px;
   font-weight: bold;
+  margin-bottom: 16px;
 }
 .items-container {
   width: 100%;
   display: flex;
-  flex-wrap: wrap;
   flex-direction: column;
+  height: calc(100% - 34px); // 34为头部+底部的高度
+  overflow-y: auto;
+
   .meta-config-item {
     flex: 1;
     padding: 0 10px;
+    margin-bottom: var(--te-common-vertical-item-spacing-normal);
   }
 }
 </style>
diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue
@@ -7,6 +7,12 @@
       </div>
       <tiny-button v-else class="edit-btn" @click="open">
         <slot name="icon"></slot>
+        <svg-icon
+          name="page-schema"
+          v-if="[buttonText[locale], buttonText].includes(EDIT_CODE_TEXT)"
+          class="edit-btn-icon"
+        ></svg-icon>
+
         {{ buttonLabel }}
       </tiny-button>
     </slot>
@@ -143,6 +149,8 @@ export default {
     const editorTipsTitle = computed(() => props.tips?.title?.[locale.value] ?? props.tips?.title)
     const editorTipsDemo = computed(() => props.tips?.demo?.[locale.value] ?? props.tips?.demo)
 
+    const EDIT_CODE_TEXT = '编辑代码'
+
     watchEffect(() => {
       const { modelValue, dataType } = props
       const val = dataType ? modelValue?.value || '' : modelValue
@@ -239,6 +247,7 @@ export default {
       editor,
       editorState,
       value,
+      EDIT_CODE_TEXT,
       options: {
         language: props.language,
         minimap: {
@@ -267,6 +276,12 @@ export default {
     &:focus {
       border-color: var(--te-common-border-active);
     }
+    .edit-btn-icon {
+      font-size: 14px;
+      margin-right: 4px;
+      vertical-align: text-top;
+      color: var(--te-common-icon-secondary);
+    }
   }
 }
 

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/configurator/package.json b/packages/configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-configurator",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

diff --git a/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue b/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue
@@ -3,17 +3,19 @@
     <div class="label">使用插槽</div>
     <tiny-form ref="slotRef" class="slot-form" :model="slotList" label-width="0" inline>
       <div v-for="(slot, index) in slotList" :key="slot.name" class="use-slot">
-        <div class="use-slot-item-name">{{ slot.name }}</div>
+        <div class="use-slot-item-name">
+          {{ slot.name }}
+          <tiny-tooltip effect="dark" :content="state.currentComponent?.content" placement="top">
+            <span class="item-icon">
+              <component :is="state.currentComponent?.icon"></component>
+            </span>
+          </tiny-tooltip>
+        </div>
         <div class="use-slot-item-content">
           <div class="use-slot-switch-wrap">
             <div :class="['e__switch', { 'e_is-checked': slot.bind }]">
               <span class="e__switch-core" @click="toggleSlot(index, slot)"></span>
             </div>
-            <tiny-tooltip effect="dark" :content="state.currentComponent?.content" placement="top">
-              <span class="item-icon">
-                <component :is="state.currentComponent?.icon"></component>
-              </span>
-            </tiny-tooltip>
           </div>
           <tiny-form-item
             :prop="paramsPropPath(index)"
@@ -191,6 +193,7 @@ export default {
 
   .use-slot-switch-wrap {
     display: flex;
+    align-items: center;
   }
 
   &-item-name {
@@ -214,7 +217,7 @@ export default {
   }
 
   .item-icon {
-    margin: 3px 3px 0 6px;
+    margin: 0 3px 0 6px;
   }
 }
 

diff --git a/packages/configurator/src/slider-configurator/SliderConfigurator.vue b/packages/configurator/src/slider-configurator/SliderConfigurator.vue
@@ -128,17 +128,17 @@ export default {
   }
   input[type='range'] {
     height: 4px;
-    border-radius: 8px;
+    border-radius: 10px;
     margin: 0.8em 0;
     padding: 0;
     cursor: pointer;
     border: 0;
-    background: -webkit-linear-gradient(var(--te-base-gray-1), var(--te-base-gray-1)) no-repeat var(--te-base-gray-17);
-    background-size: 0% 100%;
+    background-color: transparent;
     position: relative;
     outline: 0;
-    top: -1px;
-    -webkit-appearance: none !important;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
   }
   input[type='range']::-webkit-slider-thumb {
     width: 10px;
@@ -152,7 +152,9 @@ export default {
     cursor: pointer;
     background-clip: padding-box;
     box-sizing: border-box;
-    -webkit-appearance: none !important;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
   }
   input[type='range']::-webkit-slider-thumb:active {
     border: 0;

diff --git a/packages/configurator/src/slot-configurator/SlotConfigurator.vue b/packages/configurator/src/slot-configurator/SlotConfigurator.vue
@@ -137,7 +137,7 @@ export default {
   justify-content: center;
   align-items: center;
   &:not(:last-child) {
-    margin-bottom: 8px;
+    margin-bottom: var(--te-common-vertical-item-spacing-normal);
   }
   .slot-name {
     width: 30%;

diff --git a/packages/design-core/assets/empty-action.svg b/packages/design-core/assets/empty-action.svg
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "type": "module",
   "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.",
   "homepage": "https://opentiny.design/tiny-engine",

diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-cli",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

diff --git a/packages/http/package.json b/packages/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-http",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-layout",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "scripts": {
     "build": "vite build"
   },

diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/page/index.js b/packages/plugins/page/index.js
@@ -14,11 +14,10 @@ import entry, { api } from './src/Main.vue'
 import metaData from './meta.js'
 import { PageService } from './src/composable'
 import PageGeneral from './src/PageGeneral.vue'
-import { api as pageSettingApi } from './src/PageSetting.vue'
 
 export default {
   ...metaData,
-  apis: { ...api, ...pageSettingApi },
+  apis: api,
   entry,
   components: {
     PageGeneral

diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "publishConfig": {
     "access": "public"
   },