optimize ui-prop group interface in inspector (#15542)

This commit is contained in:
黄森斌
2023-06-29 11:00:21 +08:00
committed by GitHub
parent e7095340a4
commit eaab2cae0b
19 changed files with 110 additions and 292 deletions
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, isMultipleInvalid } = require('../utils/prop');
+5 -1
View File
@@ -1,5 +1,5 @@
// This is the basic template for component editing
const { updatePropByDump } = require('../utils/prop');
const { updatePropByDump, disconnectGroup } = require('../utils/prop');
exports.template = `
<div class="component-container">
@@ -13,3 +13,7 @@ exports.$ = {
exports.update = function(dump) {
updatePropByDump(this, dump);
};
exports.close = function() {
disconnectGroup(this);
};
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
exports.ready = function() {
const $prop = document.createElement('ui-prop');
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, isMultipleInvalid } = require('../utils/prop');
+3 -184
View File
@@ -1,187 +1,6 @@
'use strict';
const { getName } = require('../utils/prop');
const { template, $, update, close } = require('./base');
exports.template = `
<div class="container"></div>
`;
exports.$ = {
container: '.container',
};
exports.style = `
.tab-group {
margin-top: 4px;
}
.tab-content {
display: none;
padding-bottom: 6px;
}
`;
exports.methods = {
createTabGroup(dump) {
const $group = document.createElement('div');
$group.setAttribute('class', 'tab-group');
$group.dump = dump;
$group.tabs = {};
$group.displayOrder = dump.displayOrder;
$group.$header = document.createElement('ui-tab');
$group.$header.setAttribute('class', 'tab-header');
$group.$header.setAttribute('underline', '');
$group.appendChild($group.$header);
$group.$header.addEventListener('change', (e) => {
active(e.target.value);
});
function active(index) {
const tabNames = Object.keys($group.tabs);
const tabName = tabNames[index];
$group.childNodes.forEach((child) => {
if (!child.classList.contains('tab-content')) {
return;
}
if (child.getAttribute('name') === tabName) {
child.style.display = 'block';
} else {
child.style.display = 'none';
}
});
}
setTimeout(() => {
active(0);
});
return $group;
},
toggleGroups($groups) {
for (const key in $groups) {
const $props = Array.from($groups[key].querySelectorAll('.tab-content > ui-prop'));
const show = $props.some($prop => getComputedStyle($prop).display !== 'none');
if (show) {
$groups[key].removeAttribute('hidden');
} else {
$groups[key].setAttribute('hidden', '');
}
}
},
appendToTabGroup($group, tabName) {
if ($group.tabs[tabName]) {
return;
}
const $content = document.createElement('div');
$group.tabs[tabName] = $content;
$content.setAttribute('class', 'tab-content');
$content.setAttribute('name', tabName);
$group.appendChild($content);
const $label = document.createElement('ui-label');
$label.value = getName({ name: tabName });
const $button = document.createElement('ui-button');
$button.setAttribute('name', tabName);
$button.appendChild($label);
$group.$header.appendChild($button);
},
appendChildByDisplayOrder(parent, newChild) {
const displayOrder = newChild.displayOrder || 0;
const children = Array.from(parent.children);
const child = children.find(child => child.dump && child.displayOrder > displayOrder);
if (child) {
child.before(newChild);
} else {
parent.appendChild(newChild);
}
},
};
/**
* 自动渲染组件的方法
* @param dumps
*/
async function update(dump) {
const $panel = this;
if (!$panel.$this.isConnected) {
return;
}
const $container = $panel.$.container;
const oldPropList = Object.keys($panel.$propList);
const newPropList = [];
Object.keys(dump.value).forEach((key, index) => {
const info = dump.value[key];
if (!info.visible) {
return;
}
if (dump.values) {
info.values = dump.values.map((value) => {
return value[key].value;
});
}
const id = `${info.type || info.name}:${info.path}`;
newPropList.push(id);
let $prop = $panel.$propList[id];
if (!$prop) {
$prop = document.createElement('ui-prop');
$prop.setAttribute('type', 'dump');
$panel.$propList[id] = $prop;
const _displayOrder = info.group?.displayOrder ?? info.displayOrder;
$prop.displayOrder = _displayOrder === undefined ? index : Number(_displayOrder);
if (info.group && dump.groups) {
const { id = 'default', name } = info.group;
if (!$panel.$groups[id] && dump.groups[id]) {
if (dump.groups[id].style === 'tab') {
$panel.$groups[id] = $panel.createTabGroup(dump.groups[id]);
}
}
if ($panel.$groups[id]) {
if (!$panel.$groups[id].isConnected) {
$panel.appendChildByDisplayOrder($container, $panel.$groups[id]);
}
if (dump.groups[id].style === 'tab') {
$panel.appendToTabGroup($panel.$groups[id], name);
}
}
$panel.appendChildByDisplayOrder($panel.$groups[id].tabs[name], $prop);
} else {
$panel.appendChildByDisplayOrder($container, $prop);
}
} else if (!$prop.isConnected || !$prop.parentElement) {
if (info.group && dump.groups) {
const { id = 'default', name } = info.group;
$panel.appendChildByDisplayOrder($panel.$groups[id].tabs[name], $prop);
} else {
$panel.appendChildByDisplayOrder($container, $prop);
}
}
$prop.render(info);
});
for (const id of oldPropList) {
if (!newPropList.includes(id)) {
const $prop = $panel.$propList[id];
if ($prop && $prop.parentElement) {
$prop.parentElement.removeChild($prop);
}
}
}
$panel.toggleGroups($panel.$groups);
}
exports.template = template;
exports.$ = $;
exports.update = update;
async function ready() {
const $panel = this;
$panel.$propList = {};
$panel.$groups = {};
}
exports.ready = ready;
async function close() {
const $panel = this;
for (const key in $panel.$groups) {
$panel.$groups[key].remove();
}
$panel.$groups = {};
}
exports.close = close;
+7 -6
View File
@@ -1,9 +1,10 @@
const { getName, setHidden, isMultipleInvalid } = require('../utils/prop');
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
const fontStyles = ['isBold', 'isItalic', 'isUnderline'];
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
exports.style = /* css */`
ui-tab {
flex: none;
@@ -60,9 +61,9 @@ ui-tab {
*/
function createRadioGroup(options) {
const { enumList, getIconName, onChange, tooltip: rawTooltip } = options;
const $radioGorup = document.createElement('ui-radio-group');
$radioGorup.setAttribute('slot', 'content');
$radioGorup.addEventListener('change', (e) => {
const $radioGroup = document.createElement('ui-radio-group');
$radioGroup.setAttribute('slot', 'content');
$radioGroup.addEventListener('change', (e) => {
onChange(e);
});
@@ -79,10 +80,10 @@ function createRadioGroup(options) {
button.value = element.value;
button.setAttribute('tooltip', tooltip);
$radioGorup.appendChild(button);
$radioGroup.appendChild(button);
}
return $radioGorup;
return $radioGroup;
}
exports.ready = function() {
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, isMultipleInvalid } = require('../utils/prop');
@@ -1,10 +1,11 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
// 排列时,相邻元素的间隔间距
const MARGIN = '4PX';
const MARGIN = '4px';
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, setDisabled, isMultipleInvalid } = require('../utils/prop');
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
exports.ready = function() {
this.elements = {
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
exports.ready = function() {
const tooltip = document.createElement('ui-tooltip');
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, isMultipleInvalid } = require('../utils/prop');
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
exports.ready = function() {
const tooltip = document.createElement('ui-tooltip');
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, isMultipleInvalid } = require('../utils/prop');
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, setReadonly, isMultipleInvalid } = require('../utils/prop');
+3 -2
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden } = require('../utils/prop');
@@ -14,7 +15,7 @@ exports.ready = function() {
// Editor.Message.send('scene', 'snapshot');
const uuid = this.dump.value.uuid.value;
const dump = event.target.dump;
const undoID = await Editor.Message.request('scene', 'begin-recording',uuid);
const undoID = await Editor.Message.request('scene', 'begin-recording', uuid);
Editor.Message.request('scene', 'execute-component-method', {
uuid: this.dump.value.uuid.value,
name: 'manager.addAssetToComp',
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
const { setHidden, isMultipleInvalid } = require('../utils/prop');
+2 -1
View File
@@ -1,8 +1,9 @@
const { template, $, update } = require('./base');
const { template, $, update, close } = require('./base');
exports.template = template;
exports.$ = $;
exports.update = update;
exports.close = close;
exports.ready = function() {
this.elements = {
-1
View File
@@ -123,7 +123,6 @@ function collectGroups(dump) {
if (!dump.groups[key]) {
dump.groups[key] = {
displayOrder: Infinity,
style: 'tab',
};
}
const clone = JSON.parse(JSON.stringify(info.group));
+65 -84
View File
@@ -208,11 +208,10 @@ exports.updatePropByDump = function(panel, dump) {
return;
}
const element = panel.elements[key];
let $prop = panel.$props[key];
newPropKeys.push(key);
const element = panel.elements[key];
let $prop = panel.$props[key];
if (!$prop) {
if (element && element.create) {
// when it need to go custom initialize
@@ -234,22 +233,17 @@ exports.updatePropByDump = function(panel, dump) {
const { id = 'default', name } = info.group;
if (!panel.$groups[id] && dump.groups[id]) {
if (dump.groups[id].style === 'tab') {
panel.$groups[id] = exports.createTabGroup(dump.groups[id], panel);
}
panel.$groups[id] = exports.createGroup(dump.groups[id]);
}
if (panel.$groups[id]) {
if (!panel.$groups[id].isConnected) {
exports.appendChildByDisplayOrder(panel.$.componentContainer, panel.$groups[id]);
}
if (dump.groups[id].style === 'tab') {
exports.appendToTabGroup(panel.$groups[id], name);
}
exports.appendToGroup(panel.$groups[id], name);
}
exports.appendChildByDisplayOrder(panel.$groups[id].tabs[name], $prop);
exports.appendChildByDisplayOrder(panel.$groups[id].names[name], $prop);
} else {
exports.appendChildByDisplayOrder(panel.$.componentContainer, $prop);
}
@@ -258,7 +252,7 @@ exports.updatePropByDump = function(panel, dump) {
if (!element || !element.isAppendToParent || element.isAppendToParent.call(panel)) {
if (info.group && dump.groups) {
const { id = 'default', name } = info.group;
exports.appendChildByDisplayOrder(panel.$groups[id].tabs[name], $prop);
exports.appendChildByDisplayOrder(panel.$groups[id].names[name], $prop);
} else {
exports.appendChildByDisplayOrder(panel.$.componentContainer, $prop);
}
@@ -291,7 +285,7 @@ exports.updatePropByDump = function(panel, dump) {
}
}
exports.toggleGroups(panel.$groups);
exports.toggleGroup(panel.$groups);
};
/**
@@ -337,93 +331,68 @@ exports.getName = function(dump) {
return name.trim();
};
exports.createTabGroup = function(dump, panel) {
exports.createGroup = function(dump) {
const $group = document.createElement('div');
$group.setAttribute('class', 'tab-group');
$group.setAttribute('class', 'ui-prop-group');
$group.dump = dump;
$group.tabs = {};
$group.names = {};
$group.displayOrder = dump.displayOrder;
$group.$header = document.createElement('ui-tab');
$group.$header.setAttribute('class', 'tab-header');
$group.$header.setAttribute('underline', '');
$group.appendChild($group.$header);
$group.$header.addEventListener('change', (e) => {
active(e.target.value);
});
function active(index) {
const tabNames = Object.keys($group.tabs);
const tabName = tabNames[index];
$group.childNodes.forEach((child) => {
if (!child.classList.contains('tab-content')) {
return;
}
if (child.getAttribute('name') === tabName) {
child.style.display = 'block';
} else {
child.style.display = 'none';
}
});
}
// check style
if (!panel.$this.shadowRoot.querySelector('style#group-style')) {
const style = document.createElement('style');
style.setAttribute('id', 'group-style');
style.innerText = `
.tab-group {
margin-top: 4px;
}
.tab-content {
display: none;
padding-bottom: 6px;
}`;
panel.$.componentContainer.before(style);
}
setTimeout(() => {
active(0);
});
return $group;
};
exports.toggleGroups = function($groups) {
for (const key in $groups) {
const $props = Array.from($groups[key].querySelectorAll('.tab-content > ui-prop'));
const show = $props.some($prop => getComputedStyle($prop).display !== 'none');
if (show) {
$groups[key].removeAttribute('hidden');
} else {
$groups[key].setAttribute('hidden', '');
}
exports.toggleGroup = function($groups) {
for (const id in $groups) {
const $contents = $groups[id].querySelectorAll('.ui-prop-group-content');
$contents.forEach($content => {
const $props = Array.from($content.querySelectorAll(':scope > ui-prop'));
const show = $props.some($prop => getComputedStyle($prop).display !== 'none');
if (show) {
$content.removeAttribute('hidden');
} else {
$content.setAttribute('hidden', '');
}
});
}
},
exports.appendToTabGroup = function($group, tabName) {
if ($group.tabs[tabName]) {
exports.appendToGroup = function($group, name) {
if ($group.names[name]) {
return;
}
const $content = document.createElement('div');
const $content = document.createElement('ui-section');
$content.setAttribute('class', 'ui-prop-group-content');
$content.setAttribute('expand', '');
$group.tabs[tabName] = $content;
let parentCacheKey = 'ui-prop-group-content';
let $parent = $group;
while ($parent) {
if ($parent.hasAttribute('cache-expand')) {
parentCacheKey = $parent.getAttribute('cache-expand');
break;
}
$parent = $parent.parentElement;
}
$content.setAttribute('cache-expand', `${parentCacheKey}-${name}`);
const $header = document.createElement('ui-label');
$header.setAttribute('slot', 'header');
let displayName = name;
if (displayName.startsWith(i18nPrefix)) {
displayName = exports.getName({ displayName: name });
} else {
displayName = exports.getName({ name });
}
$header.setAttribute('value', displayName);
$content.appendChild($header);
$content.setAttribute('class', 'tab-content');
$content.setAttribute('name', tabName);
$group.appendChild($content);
$group.names[name] = $content;
const $label = document.createElement('ui-label');
$label.value = exports.getName({ name: tabName });
const $button = document.createElement('ui-button');
$button.setAttribute('name', tabName);
$button.appendChild($label);
$group.$header.appendChild($button);
};
exports.appendChildByDisplayOrder = function(parent, newChild) {
const displayOrder = newChild.displayOrder || 0;
const children = Array.from(parent.children);
@@ -442,6 +411,18 @@ exports.appendChildByDisplayOrder = function(parent, newChild) {
parent.appendChild(newChild);
}
};
exports.disconnectGroup = function(panel) {
if (panel.$groups) {
for (const key in panel.$groups) {
if (panel.$groups[key] instanceof HTMLElement) {
panel.$groups[key].remove();
}
}
panel.$groups = {};
}
};
exports.injectionStyle = `
ui-prop,