refactor: 将 experimental 更名为 advanced

This commit is contained in:
lihao.ylh 2022-01-05 19:28:34 +08:00
parent af791d1d19
commit 96ac725ce9
14 changed files with 44 additions and 49 deletions

View File

@ -78,7 +78,7 @@ export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
const { current } = this;
const canHoverHook = current?.componentMeta.getMetadata()?.experimental?.callbacks?.onHoverHook;
const canHoverHook = current?.componentMeta.getMetadata()?.advanced?.callbacks?.onHoverHook;
const canHover = (canHoverHook && typeof canHoverHook === 'function') ? canHoverHook(current.internalToShellNode()) : true;

View File

@ -41,7 +41,7 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
}
// const componentMeta = selecting[0].componentMeta;
// const metaData = componentMeta.getMetadata();
// const metadata = componentMeta.getMetadata();
return (
<Fragment>
@ -130,57 +130,45 @@ export class BoxResizingInstance extends Component<{
this.props.observed.purge();
}
getExperiMentalFns = (metaData: any) => {
if (metaData.experimental && metaData.experimental.callbacks) {
return metaData.experimantal.callbacks;
}
};
componentDidMount() {
// this.hoveringCapture.setBoundary(this.outline);
this.willBind();
const resize = (e: MouseEvent, direction: string, node: any, moveX: number, moveY: number) => {
const metaData = node.componentMeta.getMetadata();
const metadata = node.componentMeta.getMetadata();
if (
metaData &&
metaData.experimental &&
metaData.experimental.callbacks &&
typeof metaData.experimental.callbacks.onResize === 'function'
metadata?.advanced?.callbacks &&
typeof metadata.advanced.callbacks.onResize === 'function'
) {
(e as any).trigger = direction;
(e as any).deltaX = moveX;
(e as any).deltaY = moveY;
const cbNode = node?.isNode ? node.internalToShellNode() : node;
metaData.experimental.callbacks.onResize(e, cbNode);
metadata.advanced.callbacks.onResize(e, cbNode);
}
};
const resizeStart = (e: MouseEvent, direction: string, node: any) => {
const metaData = node.componentMeta.getMetadata();
const metadata = node.componentMeta.getMetadata();
if (
metaData &&
metaData.experimental &&
metaData.experimental.callbacks &&
typeof metaData.experimental.callbacks.onResizeStart === 'function'
metadata?.advanced?.callbacks &&
typeof metadata.advanced.callbacks.onResizeStart === 'function'
) {
(e as any).trigger = direction;
const cbNode = node?.isNode ? node.internalToShellNode() : node;
metaData.experimental.callbacks.onResizeStart(e, cbNode);
metadata.advanced.callbacks.onResizeStart(e, cbNode);
}
};
const resizeEnd = (e: MouseEvent, direction: string, node: any) => {
const metaData = node.componentMeta.getMetadata();
const metadata = node.componentMeta.getMetadata();
if (
metaData &&
metaData.experimental &&
metaData.experimental.callbacks &&
typeof metaData.experimental.callbacks.onResizeEnd === 'function'
metadata?.advanced?.callbacks &&
typeof metadata.advanced.callbacks.onResizeEnd === 'function'
) {
(e as any).trigger = direction;
const cbNode = node?.isNode ? node.internalToShellNode() : node;
metaData.experimental.callbacks.onResizeEnd(e, cbNode);
metadata.advanced.callbacks.onResizeEnd(e, cbNode);
}
const editor = globalContext.get(Editor);
@ -252,9 +240,9 @@ export class BoxResizingInstance extends Component<{
const { node, offsetWidth, offsetHeight, offsetTop, offsetLeft } = observed;
let triggerVisible: any = [];
const metaData = node.componentMeta.getMetadata();
if (metaData && metaData.experimental && metaData.experimental.getResizingHandlers) {
triggerVisible = metaData.experimental.getResizingHandlers(node);
const metadata = node.componentMeta.getMetadata();
if (metadata?.advanced?.getResizingHandlers) {
triggerVisible = metadata.advanced.getResizingHandlers(node);
}
const baseSideClass = 'lc-borders lc-resize-side';

View File

@ -46,7 +46,7 @@ export class BorderSelectingInstance extends Component<{
dragging,
});
const hideSelectTools = observed.node.componentMeta.getMetadata().experimental?.hideSelectTools;
const hideSelectTools = observed.node.componentMeta.getMetadata().advanced?.hideSelectTools;
if (hideSelectTools) {
return null;

View File

@ -123,7 +123,7 @@ export class InsertionView extends Component<{ host: BuiltinSimulatorHost }> {
return null;
}
// 如果是个绝对定位容器,不需要渲染插入标记
if (loc.target.componentMeta.getMetadata().experimental?.isAbsoluteLayoutContainer) {
if (loc.target.componentMeta.getMetadata().advanced?.isAbsoluteLayoutContainer) {
return null;
}

View File

@ -1139,7 +1139,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
const { nodes } = dragObject as DragNodeObject;
const operationalNodes = nodes?.filter((node) => {
const onMoveHook = node.componentMeta?.getMetadata()?.experimental?.callbacks?.onMoveHook;
const onMoveHook = node.componentMeta?.getMetadata()?.advanced?.callbacks?.onMoveHook;
const canMove = onMoveHook && typeof onMoveHook === 'function' ? onMoveHook(node.internalToShellNode()) : true;
return canMove;

View File

@ -199,7 +199,7 @@ export class ComponentMeta {
: title;
}
const liveTextEditing = this._transformedMetadata.experimental?.liveTextEditing || [];
const liveTextEditing = this._transformedMetadata.advanced?.liveTextEditing || [];
function collectLiveTextEditing(items: FieldConfig[]) {
items.forEach((config) => {
@ -219,7 +219,7 @@ export class ComponentMeta {
collectLiveTextEditing(this.configure);
this._liveTextEditing = liveTextEditing.length > 0 ? liveTextEditing : undefined;
const isTopFiexd = this._transformedMetadata.experimental?.isTopFixed;
const isTopFiexd = this._transformedMetadata.advanced?.isTopFixed;
if (isTopFiexd) {
this._isTopFixed = isTopFiexd;
@ -259,6 +259,9 @@ export class ComponentMeta {
if (!result.configure) {
result.configure = {};
}
if (result.experimental && !result.advanced) {
result.advanced = result.experimental;
}
return result as any;
}

View File

@ -524,7 +524,7 @@ export class Designer {
if (metaData.devMode === 'lowcode') {
maps[key] = metaData.schema;
} else {
const view = metaData.experimental?.view;
const view = metaData.advanced?.view;
if (view) {
maps[key] = view;
} else {

View File

@ -38,7 +38,7 @@ export default class DragGhost extends Component<{ designer: Designer }> {
this.y = e.globalY;
if (isSimulatorHost(e.sensor)) {
const container = e.sensor.getDropContainer(e);
if (container?.container.componentMeta.getMetadata().experimental?.isAbsoluteLayoutContainer) {
if (container?.container.componentMeta.getMetadata().advanced?.isAbsoluteLayoutContainer) {
this.isAbsoluteLayoutContainer = true;
return;
}

View File

@ -416,7 +416,7 @@ export class NodeChildren {
if (node.isRoot()) {
return;
}
const callbacks = owner.componentMeta.getMetadata().experimental?.callbacks;
const callbacks = owner.componentMeta.getMetadata().advanced?.callbacks;
if (callbacks?.onSubtreeModified) {
try {
callbacks?.onSubtreeModified.call(
@ -425,7 +425,7 @@ export class NodeChildren {
options,
);
} catch (e) {
console.error('error when excute experimental.callbacks.onSubtreeModified', e);
console.error('error when execute advanced.callbacks.onSubtreeModified', e);
}
}

View File

@ -223,7 +223,7 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
private autoruns?: Array<() => void>;
private setupAutoruns() {
const autoruns = this.componentMeta.getMetadata().experimental?.autoruns;
const autoruns = this.componentMeta.getMetadata().advanced?.autoruns;
if (!autoruns || autoruns.length < 1) {
return;
}
@ -237,7 +237,7 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
private initialChildren(children: any): NodeData[] {
// FIXME! this is dirty code
if (children == null) {
const initialChildren = this.componentMeta.getMetadata().experimental?.initialChildren;
const initialChildren = this.componentMeta.getMetadata().advanced?.initialChildren;
if (initialChildren) {
if (typeof initialChildren === 'function') {
return initialChildren(this as any) || [];
@ -298,7 +298,7 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
}
private didDropIn(dragment: Node) {
const callbacks = this.componentMeta.getMetadata().experimental?.callbacks;
const callbacks = this.componentMeta.getMetadata().advanced?.callbacks;
if (callbacks?.onNodeAdd) {
const cbThis = this.internalToShellNode();
callbacks?.onNodeAdd.call(cbThis, dragment.internalToShellNode(), cbThis);
@ -309,7 +309,7 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
}
private didDropOut(dragment: Node) {
const callbacks = this.componentMeta.getMetadata().experimental?.callbacks;
const callbacks = this.componentMeta.getMetadata().advanced?.callbacks;
if (callbacks?.onNodeRemove) {
const cbThis = this.internalToShellNode();
callbacks?.onNodeRemove.call(cbThis, dragment.internalToShellNode(), cbThis);

View File

@ -146,7 +146,7 @@ export class OutlineMain implements ISensor, ITreeBoard, IScrollable {
}
const operationalNodes = nodes?.filter((node: any) => {
const onMoveHook = node.componentMeta?.getMetadata()?.experimental?.callbacks?.onMoveHook;
const onMoveHook = node.componentMeta?.getMetadata()?.advanced?.callbacks?.onMoveHook;
const canMove = onMoveHook && typeof onMoveHook === 'function' ? onMoveHook(node) : true;
return canMove;

View File

@ -126,9 +126,9 @@ export interface AutorunItem {
}
/**
*
*
*/
export interface Experimental {
export interface Advanced {
/**
* @todo
*/
@ -389,9 +389,13 @@ export interface ComponentMetadata {
*/
configure?: FieldConfig[] | Configure;
/**
*
*
*/
experimental?: Experimental;
advanced?: Advanced;
/**
* @deprecated, use advanced instead
*/
experimental?: Advanced;
/**
* @todo
*/

View File

@ -66,7 +66,7 @@ export function arrShallowEquals(arr1: any[], arr2: any[]): boolean {
* @param meta
*/
export function isFromVC(meta: ComponentMeta) {
return !!meta?.getMetadata()?.experimental;
return !!meta?.getMetadata()?.advanced;
}
export function executePendingFn(fn: () => void, timeout: number = 2000) {

View File

@ -20,7 +20,7 @@ export const getClosestNode = (node: Node, until: (node: Node) => boolean): Node
* @returns {boolean} true表示可点击
*/
export const canClickNode = (node: Node, e: unknown): boolean => {
const onClickHook = node.componentMeta?.getMetadata()?.experimental?.callbacks?.onClickHook;
const onClickHook = node.componentMeta?.getMetadata()?.advanced?.callbacks?.onClickHook;
const canClick = typeof onClickHook === 'function' ? onClickHook(e as MouseEvent, node) : true;
return canClick;
};