Merge branch 'develop' of github.com:opentiny/tiny-engine into types/use-page-material2

Author: gene9831

.github/auto-labeler.yml

@@ -1,23 +1,56 @@
 version: v1
 
 labels:
-  - label: 'enhancement'
+  - label: 'ignore-for-release'
+    sync: true
+    matcher:
+      title: '^[vV]?\d+(\.\d+){2}.*'
+      body: '#ignore'
+  - label: 'breaking-change'
     sync: true
     matcher:
-      title: '^feat:.*'
-  - label: 'document'
+      title: '^.+!:|#breaking'
+      body: '#breaking'
+  - label: 'enhancement'
     sync: true
     matcher:
-      title: '^docs:.*'
+      title: '^[fF]eat.*'
   - label: 'bug'
     sync: true
     matcher:
-      title: '^fix:.*'
-  - label: 'ospp-2024'
+      title: '^[fF]ix.*'
+  - label: 'documentation'
+    sync: true
+    matcher:
+      title: '^[dD](ocs|ocumentation).*'
+      files: 'docs/**/*.md'
+  - label: 'refactoring'
+    sync: true
+    matcher:
+      title: '^[rR]efactor.*'
+  - label: 'test'
+    sync: true
+    matcher:
+      title: '^[tT]est.*'
+      files: '**/__tests__/**'
+  - label: 'chore'
+    sync: true
+    matcher:
+      title: '^[cC]hore.*'
+  - label: 'ci'
+    sync: true
+    matcher:
+      title: '^[cC]i.*'
+      files: '.github/**'
+  - label: 'ospp'
+    sync: true
+    matcher:
+      baseBranch: '^ospp-\d+\/.*'
+  - label: '1.x'
     sync: true
     matcher:
-      baseBranch: '^ospp-2024/.*'
-  - label: 'refactor-main'
+      baseBranch: '^v1\.x'
+  - label: 'release'
     sync: true
     matcher:
-      baseBranch: 'refactor/develop'
+      baseBranch: '^release\/v2.*'

.github/release.yml

@@ -2,8 +2,6 @@ changelog:
   exclude:
     labels:
       - ignore-for-release
-    authors:
-      - allcontributors[bot]
   categories:
     - title: Breaking Changes 🛠
       labels:
@@ -18,9 +16,16 @@ changelog:
       labels:
         - Semver-Patch
         - bug
-    - title: Other Changes
+    - title: "📖 Documentation"
       labels:
         - documentation
+    - title: "🔧 Maintenance"
+      labels:
         - refactoring
+        - test
         - unit-test
+        - chore
         - ci
+    - title: "Other Changes"
+      labels: ["*"]
+      collapse: true

README.md

@@ -58,7 +58,7 @@ $ pnpm splitMaterials
 $ pnpm buildMaterials
 ```
 
-Open a browser: `http://localhost:8080/?type=app&id=918&tenant=1&pageid=NTJ4MjvqoVj8OVsc`
+Open a browser: `http://localhost:8080/?type=app&id=1&tenant=1&pageid=NTJ4MjvqoVj8OVsc`
 `url search` Parameters:
 
 - `type=app` Application type

README.zh-CN.md

@@ -58,7 +58,7 @@ $ pnpm splitMaterials
 $ pnpm buildMaterials
 ```
 
-浏览器打开：`http://localhost:8080/?type=app&id=918&tenant=1&pageid=NTJ4MjvqoVj8OVsc`  
+浏览器打开：`http://localhost:8080/?type=app&id=1&tenant=1&pageid=NTJ4MjvqoVj8OVsc`  
 `url search`参数：
 
 - `type=app` 应用类型

designer-demo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.3.0",
+  "version": "2.5.0-alpha.2",
   "type": "module",
   "scripts": {
     "dev": "cross-env vite",

designer-demo/public/mock/bundle.json

@@ -8020,7 +8020,9 @@
                     "cols": 12,
                     "widget": {
                       "component": "CodeConfigurator",
-                      "props": {}
+                      "props": {
+                        "language": "json"
+                      }
                     },
                     "description": {
                       "zh_CN": "checkbox组件列表"
@@ -10534,6 +10536,27 @@
                       "zh_CN": "是否禁用"
                     },
                     "labelPosition": "left"
+                  },
+                  {
+                    "property": "auto-lookup",
+                    "label": {
+                      "text": {
+                        "zh_CN": "自动请求数据"
+                      }
+                    },
+                    "required": false,
+                    "readOnly": false,
+                    "disabled": false,
+                    "cols": 12,
+                    "defaultValue": true,
+                    "widget": {
+                      "component": "CheckBoxConfigurator",
+                      "props": {}
+                    },
+                    "description": {
+                      "zh_CN": "初始化时是否自动请求数据,默认 true"
+                    },
+                    "labelPosition": "left"
                   }
                 ]
               },
@@ -13029,7 +13052,7 @@
               "schema": {
                 "componentName": "video",
                 "props": {
-                  "src": "img/webNova.jpg",
+                  "src": "https://tinyengine-assets.obs.myhuaweicloud.com/files/in-action.mp4#t=1.5",
                   "width": "200",
                   "height": "100",
                   "style": "border:1px solid #ccc"

docs/api/backend-api/material-center.md

@@ -215,7 +215,7 @@ tenant 通过前端配置统一 x-lowcode-org 请求头传递，接口中不用
 
 | 参数名称          | 是否必须 | 示例 | 备注                                                         |
 | ----------------- | -------- | ---- | ------------------------------------------------------------ |
-| appId             | 否       | 918  | 应用id  用于筛选某个应用下的区块                             |
+| appId             | 否       | 1  | 应用id  用于筛选某个应用下的区块                             |
 | public_scope_mode | 否       | 1    | 不传将只显示公开的区块，传入1， 可根据public进行公开性筛选，默认展示全部私有/公开区块 |
 
 ### 返回数据

docs/solutions/server-deployment-solution.md

@@ -283,7 +283,7 @@ export default (app: Application) => {
 
 使用本地开发流程，启动服务成功后访问
 
-`http://localhost:7011/entry?id=918&type=app`
+`http://localhost:7011/entry?id=1&type=app`
 
 验证是否存在问题，如正常则部署服务
 

mockServer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.3.0",
+  "version": "2.5.0-alpha.2",
   "publishConfig": {
     "access": "public"
   },