From 914c21893fc38feb7915d37efa9b874d68c37719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=A3=AE=E6=96=8C?= <arsen2010@126.com>
Date: Sat, 17 Sep 2022 12:36:30 +0800
Subject: [PATCH] modify node mobility (#6)

---
 editor/inspector/components/class.js    | 2 +-
 editor/inspector/contributions/node.js  | 3 +++
 editor/inspector/contributions/utils.js | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/editor/inspector/components/class.js b/editor/inspector/components/class.js
index 27dbf736d64..1aacc02b9ba 100644
--- a/editor/inspector/components/class.js
+++ b/editor/inspector/components/class.js
@@ -117,7 +117,7 @@ async function update(dump) {
             $prop.setAttribute('type', 'dump');
             $panel.$propList[id] = $prop;
 
-            const _displayOrder = info.group?.displayOrder || info.displayOrder;
+            const _displayOrder = info.group?.displayOrder ?? info.displayOrder;
             $prop.displayOrder = _displayOrder === undefined ? index : Number(_displayOrder);
 
             if (info.group && dump.groups) {
diff --git a/editor/inspector/contributions/node.js b/editor/inspector/contributions/node.js
index 56b4eb52f02..6d9898550c4 100644
--- a/editor/inspector/contributions/node.js
+++ b/editor/inspector/contributions/node.js
@@ -304,6 +304,7 @@ exports.template = /* html*/`
         <ui-prop class="position" type="dump"></ui-prop>
         <ui-prop class="rotation" type="dump"></ui-prop>
         <ui-prop class="scale" type="dump"></ui-prop>
+        <ui-prop class="mobility" type="dump"></ui-prop>
         <ui-prop class="layer" type="dump" html="false">
             <ui-label slot="label" value="Layer"></ui-label>
             <div class="layer-content" slot="content">
@@ -366,6 +367,7 @@ exports.$ = {
     nodePosition: '.node > .position',
     nodeRotation: '.node > .rotation',
     nodeScale: '.node > .scale',
+    nodeMobility: '.node > .mobility',
     nodeLayer: '.node > .layer',
     nodeLayerSelect: '.node > .layer .layer-select',
     nodeLayerButton: '.node > .layer .layer-edit',
@@ -907,6 +909,7 @@ const Elements = {
             panel.$.nodePosition.render(panel.dump.position);
             panel.$.nodeRotation.render(panel.dump.rotation);
             panel.$.nodeScale.render(panel.dump.scale);
+            panel.$.nodeMobility.render(panel.dump.mobility);
             panel.$.nodeLayer.render(panel.dump.layer);
 
             // 查找需要渲染的 component 列表
diff --git a/editor/inspector/contributions/utils.js b/editor/inspector/contributions/utils.js
index 13d414f5249..97ab77479b1 100644
--- a/editor/inspector/contributions/utils.js
+++ b/editor/inspector/contributions/utils.js
@@ -137,6 +137,7 @@ function translationDump(dump, dumps, assets) {
     dump.position.path = 'position';
     dump.rotation.path = 'rotation';
     dump.scale.path = 'scale';
+    dump.mobility.path = 'mobility';
     dump.layer.path = 'layer';
     if (dumps) {
         dump.active.values = dumps.map((dump) => dump.active.value);
@@ -144,6 +145,7 @@ function translationDump(dump, dumps, assets) {
         dump.position.values = dumps.map((dump) => dump.position.value);
         dump.rotation.values = dumps.map((dump) => dump.rotation.value);
         dump.scale.values = dumps.map((dump) => dump.scale.value);
+        dump.mobility.values = dumps.map((dump) => dump.mobility.value);
         dump.layer.values = dumps.map((dump) => dump.layer.value);
     }
     for (let i = 0; i < dump.__comps__.length; i++) {