Merge branch 'develop' into ospp-2024/003-react-dsl

opentiny · Oct 31, 2024 · 6f717e8 · 6f717e8
2 parents ced63b0 + d90f0f2
commit 6f717e8
Show file tree

Hide file tree

Showing 119 changed files with 1,214 additions and 309 deletions.
diff --git a/README.md b/README.md
@@ -88,9 +88,9 @@ gantt
 dateFormat YYYY-MM-DD
 axisFormat %Y-%m-%d
 
-	1.0.0-beta.x version	:active,2023-09-25, 2024-03-31
-	1.0.0-rc	version    :       2024-04-01, 2024-06-30
-	1.0.0 version   :          2024-07-01, 2024-07-31
+1.0.0-beta.x version : 2023-09-25, 2024-05-20
+1.0.0-rc version(refactor version) : 2024-10-01
+1.0.0 version : 2024-11-01
 
 ```
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -84,13 +84,13 @@ pnpm run build:alpha  或 build:prod
 ## 里程碑
 
 ```mermaid
-gantt
+gantt 
 dateFormat YYYY-MM-DD
 axisFormat %Y-%m-%d
 
-	1.0.0-beta.x version	:active,2023-09-25, 2024-03-31
-	1.0.0-rc	version    :       2024-04-01, 2024-06-30
-	1.0.0 version   :          2024-07-01, 2024-07-31
+1.0.0-beta.x version : 2023-09-25, 2024-05-20
+1.0.0-rc version(refactor version) : 2024-10-01
+1.0.0 version : 2024-11-01
 
 ```
 

diff --git a/mockServer/package.json b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@opentiny/tiny-engine-dsl-react": "workspace:*",
-    "@opentiny/tiny-engine-dsl-vue": "workspace:*",
+    "@opentiny/tiny-engine-dsl-vue": "^1.0.6",
     "@seald-io/nedb": "^4.0.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.4",

diff --git a/mockServer/src/mock/get/app-center/v1/apps/schema/918.json b/mockServer/src/mock/get/app-center/v1/apps/schema/918.json
@@ -1918,6 +1918,13 @@
         "destructuring": true,
         "version": "0.1.17"
       },
+      {
+        "componentName": "TinyCheckbox",
+        "package": "@opentiny/vue",
+        "exportName": "Checkbox",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
       {
         "componentName": "TinySelect",
         "package": "@opentiny/vue",
@@ -1974,6 +1981,76 @@
         "destructuring": true,
         "version": "0.1.16"
       },
+      {
+        "componentName": "TinyCollapse",
+        "package": "@opentiny/vue",
+        "exportName": "Collapse",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "TinyCollapseItem",
+        "package": "@opentiny/vue",
+        "exportName": "CollapseItem",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "TinyBreadcrumb",
+        "package": "@opentiny/vue",
+        "exportName": "Breadcrumb",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "TinyBreadcrumbItem",
+        "package": "@opentiny/vue",
+        "exportName": "BreadcrumbItem",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "ElInput",
+        "package": "element-plus",
+        "exportName": "ElInput",
+        "destructuring": true,
+        "version": "2.4.2"
+      },
+      {
+        "componentName": "ElButton",
+        "package": "element-plus",
+        "exportName": "ElButton",
+        "destructuring": true,
+        "version": "2.4.2"
+      },
+      {
+        "componentName": "ElForm",
+        "package": "element-plus",
+        "exportName": "ElForm",
+        "destructuring": true,
+        "version": "2.4.2"
+      },
+      {
+        "componentName": "ElFormItem",
+        "package": "element-plus",
+        "exportName": "ElFormItem",
+        "destructuring": true,
+        "version": "2.4.2"
+      },
+      {
+        "componentName": "ElTable",
+        "package": "element-plus",
+        "exportName": "ElTable",
+        "destructuring": true,
+        "version": "2.4.2"
+      },
+      {
+        "componentName": "ElTableColumn",
+        "package": "element-plus",
+        "exportName": "ElTableColumn",
+        "destructuring": true,
+        "version": "2.4.2"
+      },
       {
         "componentName": "PortalHome",
         "main": "common/components/home",

diff --git a/mockServer/src/services/block.js b/mockServer/src/services/block.js
@@ -72,7 +72,8 @@ export default class BlockService {
 
   async detail(blockId) {
     const result = await this.db.findOneAsync({ _id: blockId })
-    return result
+
+    return getResponseData(result)
   }
 
   async delete(blockId) {

diff --git a/package.json b/package.json
@@ -25,8 +25,6 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.21.3",
-    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
-    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@types/node": "^18.0.0",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",

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

diff --git a/packages/blockToWebComponentTemplate/vite.config.js b/packages/blockToWebComponentTemplate/vite.config.js
@@ -43,7 +43,7 @@ export default defineConfig(({ command, mode }) => {
   }
 
   const vuePluginConfig = {}
-  const styleLinks = ['https://npm.onmicrosoft.cn/@opentiny/[email protected]/index.css']
+  const styleLinks = ['https://unpkg.com/@opentiny/[email protected]/index.css']
 
   config.publicDir = false
 

diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "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": "1.0.3",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/canvas/src/components/container/CanvasAction.vue b/packages/canvas/src/components/container/CanvasAction.vue
@@ -229,7 +229,10 @@ export default {
     }
 
     const showAction = computed(() => {
-      const { parent } = getCurrent()
+      const { schema, parent } = getCurrent()
+      if (schema?.props?.['data-id'] === 'root-container') {
+        return false
+      }
       return !props.resize && parent && parent?.type !== 'JSSlot'
     })
 

diff --git a/packages/canvas/src/components/container/container.js b/packages/canvas/src/components/container/container.js
@@ -185,6 +185,8 @@ export const dragEnd = () => {
   if (element && canvasState.type === 'absolute') {
     data.props = data.props || {}
     data.props.style = element.style.cssText
+
+    getController().addHistory()
   }
 
   // 重置拖拽状态
@@ -542,6 +544,8 @@ const setHoverRect = (element, data) => {
   return undefined
 }
 
+let moveUpdateTimer = null
+
 // 绝对布局
 const absoluteMove = (event, element) => {
   const { clientX, clientY } = event
@@ -573,6 +577,19 @@ const absoluteMove = (event, element) => {
       element.style.height = `${clientY - y}px`
     }
   }
+
+  clearTimeout(moveUpdateTimer)
+
+  const { data } = dragState
+  data.props = data.props || {}
+
+  // 防抖更新位置信息到 schema
+  moveUpdateTimer = setTimeout(() => {
+    data.props.style = element.style.cssText
+
+    getController().addHistory()
+  }, 100)
+
   updateRect()
 }
 
@@ -717,11 +734,7 @@ export const onMouseUp = () => {
       if (absolute) {
         targetNode.node = getSchema()
         data.props = data.props || {}
-        data.props.style = {
-          position: 'absolute',
-          top: dragState.mouse.y + 'px',
-          left: dragState.mouse.x + 'px'
-        }
+        data.props.style = `position: absolute; top: ${dragState.mouse.y}px; left: ${dragState.mouse.x}px`
       }
 
       insertNode(targetNode, position)

diff --git a/packages/canvas/src/components/render/RenderMain.js b/packages/canvas/src/components/render/RenderMain.js
@@ -379,7 +379,8 @@ export default {
     // 渲染画布增加根节点，与出码和预览保持一致
     const rootChildrenSchema = {
       componentName: 'div',
-      props: schema.props,
+      // 手动添加一个唯一的属性，后续在画布选中此节点时方便处理额外的逻辑。由于没有修改schema，不会影响出码
+      props: { ...schema.props, 'data-id': 'root-container' },
       children: schema.children
     }
 

diff --git a/packages/canvas/src/components/render/render.js b/packages/canvas/src/components/render/render.js
@@ -581,7 +581,7 @@ const getBindProps = (schema, scope) => {
     ...parseData(schema.props, scope),
     [DESIGN_UIDKEY]: id,
     [DESIGN_TAGKEY]: componentName,
-    onMouseOver: stopEvent,
+    onMouseover: stopEvent,
     onFocus: stopEvent
   }
   if (scope) {

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
@@ -82,7 +82,7 @@ import {
   FormItem as TinyFormItem
 } from '@opentiny/vue'
 import { theme } from '@opentiny/tiny-engine-controller/adapter'
-import { useLayout, useNotify, useCanvas } from '@opentiny/tiny-engine-controller'
+import { useLayout, useNotify, useCanvas, useBlock } from '@opentiny/tiny-engine-controller'
 import { constants } from '@opentiny/tiny-engine-utils'
 import VueMonaco from './VueMonaco.vue'
 
@@ -163,7 +163,7 @@ export default {
         const { getEditBlock, publishBlock } = getPluginApi(PLUGIN_NAME.BlockManage)
         if (valid) {
           const params = {
-            block: getEditBlock(),
+            block: getEditBlock() || useBlock().getCurrentBlock(),
             is_compile: true,
             deploy_info: formState.deployInfo,
             version: formState.version,

diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue
@@ -295,16 +295,13 @@ export default {
       result.message = typeof message === 'string' ? message : message?.[locale.value]
     }
 
+    const isEmptyInputValue = (value) => {
+      // 通过 value == null 做隐式类型转换
+      // 空值约定为 undefined | null | ''
+      return value == null || (typeOf(value) === TYPES.StringType && value.trim() === '')
+    }
     const verifyRequired = (value) => {
-      if (typeOf(value) === TYPES.BooleanType) {
-        return true
-      }
-
-      if (typeOf(value) === TYPES.StringType) {
-        return value.trim()
-      }
-
-      return value
+      return !isEmptyInputValue(value)
     }
 
     const verifyValue = (value = '', rules = []) => {

diff --git a/packages/common/component/LifeCycles.vue b/packages/common/component/LifeCycles.vue
@@ -129,7 +129,7 @@ export default {
     })
 
     watchEffect(() => {
-      state.bindLifeCycles = props.bindLifeCycles || useCanvas().canvasApi.value?.getSchema()?.lifeCycles || {}
+      state.bindLifeCycles = props.bindLifeCycles || {}
     })
 
     const searchLifeCyclesList = (value) => {