feat(editor): Image, Text, ..., add isNotAbsolutePosition in Config

yyc-git · yyc-git · commit d6564434973a · 2026-03-05T15:52:01.000+08:00
diff --git a/contributes/meta3d-ui-control-checkbox/package.json b/contributes/meta3d-ui-control-checkbox/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-checkbox",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "displayName": "复选框",
     "publisher": "meta3d",
     "protocol": {
@@ -18,7 +18,7 @@
     "dependencies": {
         "meta3d-editor-whole-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
-        "meta3d-ui-control-checkbox-protocol": "^1.3.0"
+        "meta3d-ui-control-checkbox-protocol": "^1.3.6"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^4.0.0",
diff --git a/contributes/meta3d-ui-control-checkbox/src/Main.ts b/contributes/meta3d-ui-control-checkbox/src/Main.ts
@@ -8,9 +8,10 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
         uiControlName: uiControlName,
         func: (meta3dState,
             getInputFunc,
-            _,
+            rect,
             {
                 label,
+                isNotAbsolutePosition,
                 isSelect
             }
         ) => {
@@ -23,7 +24,11 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             }
 
             return inputPromise.then(isSelect => {
-                let { checkbox } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+                let { checkbox, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+
+                if (!isNotAbsolutePosition) {
+                    meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                }
 
                 let data = checkbox(meta3dState, label, isSelect)
                 meta3dState = data[0]
diff --git a/contributes/meta3d-ui-control-image-button/package.json b/contributes/meta3d-ui-control-image-button/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-image-button",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "displayName": "图片按钮",
     "publisher": "meta3d",
     "description": "",
@@ -19,7 +19,7 @@
     "dependencies": {
         "meta3d-editor-whole-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
-        "meta3d-ui-control-image-button-protocol": "^1.3.0"
+        "meta3d-ui-control-image-button-protocol": "^1.3.6"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^4.0.0",
diff --git a/contributes/meta3d-ui-control-image-button/src/Main.ts b/contributes/meta3d-ui-control-image-button/src/Main.ts
@@ -1,4 +1,4 @@
-import { state as meta3dState,  api, getContribute as getContributeMeta3D } from "meta3d-type"
+import { state as meta3dState, api, getContribute as getContributeMeta3D } from "meta3d-type"
 import { inputFunc, specificData, outputData, uiControlName, state, imageBase64 } from "meta3d-ui-control-image-button-protocol"
 import { service, uiControlContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType"
 import { nullable } from "meta3d-commonlib-ts/src/nullable"
@@ -41,6 +41,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             rect,
             {
                 label,
+                isNotAbsolutePosition,
                 image,
             }
         ) => {
@@ -59,7 +60,9 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             ).then(meta3dState => {
                 let { imageButton, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
 
-                meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                if (!isNotAbsolutePosition) {
+                    meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                }
 
                 let { clickTexture } = api.nullable.getExn(api.uiControl.getUIControlState<state>(meta3dState, label))
 
diff --git a/contributes/meta3d-ui-control-image-popup/package.json b/contributes/meta3d-ui-control-image-popup/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-image-popup",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "displayName": "图片弹出框",
     "publisher": "meta3d",
     "protocol": {
@@ -18,7 +18,7 @@
     "dependencies": {
         "meta3d-editor-whole-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
-        "meta3d-ui-control-image-popup-protocol": "^1.3.0"
+        "meta3d-ui-control-image-popup-protocol": "^1.3.6"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^4.0.0",
diff --git a/contributes/meta3d-ui-control-image-popup/src/Main.ts b/contributes/meta3d-ui-control-image-popup/src/Main.ts
@@ -42,6 +42,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             rect,
             {
                 label,
+                isNotAbsolutePosition,
                 image,
                 id
             }
@@ -68,7 +69,11 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
                     label,
                     image,
                 ).then(meta3dState => {
-                    let { imagePopup } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+                    let { imagePopup, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+
+                    if (!isNotAbsolutePosition) {
+                        meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                    }
 
                     let { clickTexture } = api.nullable.getExn(api.uiControl.getUIControlState<state>(meta3dState, label))
 
diff --git a/contributes/meta3d-ui-control-image/package.json b/contributes/meta3d-ui-control-image/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-image",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "displayName": "图片",
     "publisher": "meta3d",
     "description": "",
@@ -19,7 +19,7 @@
     "dependencies": {
         "meta3d-editor-whole-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
-        "meta3d-ui-control-image-protocol": "^1.3.0"
+        "meta3d-ui-control-image-protocol": "^1.3.6"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^4.0.0",
diff --git a/contributes/meta3d-ui-control-image/src/Main.ts b/contributes/meta3d-ui-control-image/src/Main.ts
@@ -43,6 +43,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             rect,
             {
                 label,
+                isNotAbsolutePosition
             }
         ) => {
             let inputPromise: Promise<data>
@@ -69,7 +70,9 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
                 ).then(meta3dState => {
                     let { image, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
 
-                    meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                    if (!isNotAbsolutePosition) {
+                        meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                    }
 
                     let { clickTexture } = api.nullable.getExn(api.uiControl.getUIControlState<state>(meta3dState, label))
 
diff --git a/contributes/meta3d-ui-control-text/package.json b/contributes/meta3d-ui-control-text/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-text",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "displayName": "文字",
     "publisher": "meta3d",
     "description": "",
@@ -19,7 +19,7 @@
     "dependencies": {
         "meta3d-editor-whole-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
-        "meta3d-ui-control-text-protocol": "^1.3.0"
+        "meta3d-ui-control-text-protocol": "^1.3.6"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^4.0.0",
diff --git a/contributes/meta3d-ui-control-text/src/Main.ts b/contributes/meta3d-ui-control-text/src/Main.ts
@@ -9,6 +9,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             getInputFunc,
             rect,
             {
+                isNotAbsolutePosition
             }
         ) => {
             if (api.nullable.isNullable(getInputFunc)) {
@@ -21,8 +22,11 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
                 }
 
                 text_ = api.nullable.getExn(text_)
+                let { text, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
 
-                let { text } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+                if (!isNotAbsolutePosition) {
+                    meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                }
 
                 return [text(meta3dState, text_), null]
             })
diff --git a/contributes/meta3d-ui-control-textcolored/package.json b/contributes/meta3d-ui-control-textcolored/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-textcolored",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "displayName": "带颜色的文字",
     "publisher": "meta3d",
     "description": "",
@@ -19,7 +19,7 @@
     "dependencies": {
         "meta3d-editor-whole-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
-        "meta3d-ui-control-textcolored-protocol": "^1.3.1"
+        "meta3d-ui-control-textcolored-protocol": "^1.3.6"
     },
     "devDependencies": {
         "clean-webpack-plugin": "^4.0.0",
diff --git a/contributes/meta3d-ui-control-textcolored/src/Main.ts b/contributes/meta3d-ui-control-textcolored/src/Main.ts
@@ -9,6 +9,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
             getInputFunc,
             rect,
             {
+                isNotAbsolutePosition,
                 color
             }
         ) => {
@@ -23,7 +24,11 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
 
                 text = api.nullable.getExn(text)
 
-                let { textColored } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+                let { textColored, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)
+
+                if (!isNotAbsolutePosition) {
+                    meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])
+                }
 
                 return [textColored(meta3dState, color, text), null]
             })
diff --git a/doc/1.3.1.org b/doc/1.3.1.org
@@ -1588,6 +1588,8 @@ TODO css: add button to show it
 TODO Image, Text, ... config add isNotAbsolutePosition
 
 
+# TODO fix: handle duplicate Input(e.g. Image)
+
 
 
 TODO set value
diff --git a/protocols/contribute_protocols/meta3d-ui-control-checkbox-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-checkbox-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-checkbox-protocol",
-    "version": "1.3.1",
+    "version": "1.3.6",
     "displayName": "复选框",
     "publisher": "meta3d",
     "author": "Meta3D",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-checkbox-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-checkbox-protocol/src/Config.ts
@@ -18,6 +18,11 @@ export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D
         type_: "string",
         value: "复选框##" + _generateUniqueId()
     },
+    {
+        name: "isNotAbsolutePosition",
+        type_: "bool",
+        value: false
+    },
     {
         name: "isSelect",
         type_: "bool",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-checkbox-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-checkbox-protocol/src/Index.ts
@@ -9,6 +9,7 @@ export type inputFunc = nullable<func>
 
 export type specificData = {
     label: string,
+    isNotAbsolutePosition: boolean
     isSelect: boolean,
 }
 
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-button-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-image-button-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-image-button-protocol",
-    "version": "1.3.1",
+    "version": "1.3.6",
     "displayName": "图片按钮",
     "publisher": "meta3d",
     "author": "Meta3D",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-button-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-image-button-protocol/src/Config.ts
@@ -18,6 +18,11 @@ export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D
         type_: "string",
         value: "图片按钮##" + _generateUniqueId()
     },
+    {
+        name: "isNotAbsolutePosition",
+        type_: "bool",
+        value: false
+    },
     {
         name: "image",
         type_: "imageBase64",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-button-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-image-button-protocol/src/Index.ts
@@ -14,6 +14,7 @@ export type inputFunc = null
 
 export type specificData = {
     label: string,
+    isNotAbsolutePosition: boolean
     image: nullable<imageBase64>,
 }
 
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-popup-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-image-popup-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-image-popup-protocol",
-    "version": "1.3.1",
+    "version": "1.3.6",
     "displayName": "图片弹出框",
     "publisher": "meta3d",
     "author": "Meta3D",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-popup-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-image-popup-protocol/src/Config.ts
@@ -18,6 +18,11 @@ export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D
         type_: "string",
         value: "图片弹出框##" + _generateUniqueId()
     },
+    {
+        name: "isNotAbsolutePosition",
+        type_: "bool",
+        value: false
+    },
     {
         name: "image",
         type_: "imageBase64",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-popup-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-image-popup-protocol/src/Index.ts
@@ -15,6 +15,7 @@ export type inputFunc = nullable<func>
 
 export type specificData = {
     label: string,
+    isNotAbsolutePosition: boolean
     image: nullable<imageBase64>,
     id: string,
 }
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-image-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-image-protocol",
-    "version": "1.3.1",
+    "version": "1.3.6",
     "displayName": "图片",
     "publisher": "meta3d",
     "author": "Meta3D",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-image-protocol/src/Config.ts
@@ -16,7 +16,12 @@ export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D
         name: "label",
         type_: "string",
         value: "图片##" + _generateUniqueId()
-    }
+    },
+    {
+        name: "isNotAbsolutePosition",
+        type_: "bool",
+        value: false
+    },
 ]
 
 export let hasChildren: hasChildrenMeta3D = () => false
diff --git a/protocols/contribute_protocols/meta3d-ui-control-image-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-image-protocol/src/Index.ts
@@ -15,6 +15,7 @@ export type inputFunc = nullable<func>
 
 export type specificData = {
     label: string,
+    isNotAbsolutePosition: boolean
 }
 
 export type outputData = null
diff --git a/protocols/contribute_protocols/meta3d-ui-control-text-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-text-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-text-protocol",
-    "version": "1.3.2",
+    "version": "1.3.6",
     "displayName": "文字",
     "publisher": "meta3d",
     "author": "Meta3D",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-text-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-text-protocol/src/Config.ts
@@ -5,7 +5,13 @@ import {
     getUIControlSupportedEventNames as getUIControlSupportedEventNamesMeta3D, generateHandleUIControlEventStr as generateHandleUIControlEventStrMeta3D
 } from "meta3d-type/src/contribute/UIControlProtocolConfigType"
 
-export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D = () => []
+export let getUIControlSpecificDataFields: getUIControlSpecificDataFieldsMeta3D = () => [
+    {
+        name: "isNotAbsolutePosition",
+        type_: "bool",
+        value: false
+    },
+]
 
 export let hasChildren: hasChildrenMeta3D = () => false
 
diff --git a/protocols/contribute_protocols/meta3d-ui-control-text-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-text-protocol/src/Index.ts
@@ -9,6 +9,7 @@ export type state = null
 export type inputFunc = nullable<func>
 
 export type specificData = {
+    isNotAbsolutePosition: boolean
 }
 
 export type outputData = null
diff --git a/protocols/contribute_protocols/meta3d-ui-control-textcolored-protocol/package.json b/protocols/contribute_protocols/meta3d-ui-control-textcolored-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-ui-control-textcolored-protocol",
-    "version": "1.3.3",
+    "version": "1.3.6",
     "displayName": "带颜色的文字",
     "publisher": "meta3d",
     "author": "Meta3D",
diff --git a/protocols/contribute_protocols/meta3d-ui-control-textcolored-protocol/src/Config.ts b/protocols/contribute_protocols/meta3d-ui-control-textcolored-protocol/src/Config.ts
diff --git a/protocols/contribute_protocols/meta3d-ui-control-textcolored-protocol/src/Index.ts b/protocols/contribute_protocols/meta3d-ui-control-textcolored-protocol/src/Index.ts

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe`
`9`	`9`	`getInputFunc,`
`10`	`10`	`rect,`
`11`	`11`	`{`
	`12`	`+ isNotAbsolutePosition`
`12`	`13`	`}`
`13`	`14`	`) => {`
`14`	`15`	`if (api.nullable.isNullable(getInputFunc)) {`
`@@ -21,8 +22,11 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`text_ = api.nullable.getExn(text_)`
	`25`	`+ let { text, setCursorPos } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)`
`24`	`26`
`25`		`- let { text } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).ui(meta3dState)`
	`27`	`+ if (!isNotAbsolutePosition) {`
	`28`	`+ meta3dState = setCursorPos(meta3dState, [rect.x, rect.y])`
	`29`	`+ }`
`26`	`30`
`27`	`31`	`return [text(meta3dState, text_), null]`
`28`	`32`	`})`