mirror of
https://github.com/alibaba/lowcode-engine.git
synced 2026-01-20 07:14:23 +00:00
fix: 修复部分属性由于清空,丢失问题 & 修复 function 组件静态属性丢失问题
This commit is contained in:
parent
7b181521b9
commit
a652b1f6f2
Binary file not shown.
|
Before Width: | Height: | Size: 3.5 KiB |
@ -1,87 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
|
|
||||||
<meta name="viewport" content="width=device-width" />
|
|
||||||
<title>LowCodeEngine Editor DEMO</title>
|
|
||||||
<link rel="shortcut icon" href="./favicon.png" />
|
|
||||||
<link rel="stylesheet" data-name="vs/editor/editor.main" href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.css"/>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/react/16.9.0/umd/react.development.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/react-dom/16.9.0/umd/react-dom.development.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/prop-types/15.7.2/prop-types.js"></script>
|
|
||||||
<script>
|
|
||||||
React.PropTypes = PropTypes;
|
|
||||||
</script>
|
|
||||||
<script src="https://g.alicdn.com/platform/c/??react15-polyfill/0.0.1/dist/index.js,lodash/4.6.1/lodash.min.js,immutable/3.7.6/dist/immutable.min.js,natty-storage/2.0.2/dist/natty-storage.min.js,natty-fetch/2.6.0/dist/natty-fetch.pc.min.js,tinymce/4.2.5/tinymce-full.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/mylib/moment/2.24.0/min/moment.min.js"></script>
|
|
||||||
<link rel="stylesheet" href="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.css" />
|
|
||||||
<script src="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.js"></script>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/rax@1.1.3/dist/rax.js"></script>
|
|
||||||
<!-- <script src="http://192.168.0.106:8000/lc-engine.js"></script> -->
|
|
||||||
<script>
|
|
||||||
var require = { paths: { vs: 'https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs' } };
|
|
||||||
</script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/loader.min.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/editor/editor.main.nls.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/monaco-editor/0.21.2/min/vs/editor/editor.main.js"></script>
|
|
||||||
<link rel="stylesheet" href="/css/editor-preset-vision.css" />
|
|
||||||
<script>
|
|
||||||
window.pageConfig = {
|
|
||||||
env: 'release',
|
|
||||||
locale: 'zh_CN',
|
|
||||||
pageType: 'single',
|
|
||||||
deviceType: 'web',
|
|
||||||
appName: '基础包管理后台',
|
|
||||||
appType: 'legao_base_packages',
|
|
||||||
templateType: '',
|
|
||||||
pageId: 'FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V',
|
|
||||||
slug: 'test',
|
|
||||||
appMode: 'back',
|
|
||||||
isAppAdmin: 'y',
|
|
||||||
isSuperAdmin: 'n',
|
|
||||||
isBetaDeveloper: 'n',
|
|
||||||
formType: 'display',
|
|
||||||
title: { en_US: '测试', type: 'i18n', zh_CN: '测试' },
|
|
||||||
urlPrefix: 'https://go.alibaba-inc.com',
|
|
||||||
APIUrlPrefix: 'https://go.alibaba-inc.com',
|
|
||||||
devVersion: '0.1.0', // 这个是子应用的变更 id
|
|
||||||
subAppType: '0.1.0',
|
|
||||||
appKey: 'legao_base_packages',
|
|
||||||
RE_VERSION: '7.1.1',
|
|
||||||
appSource: '',
|
|
||||||
isDomainDefault: 'n',
|
|
||||||
useReleaseBundle: 'n',
|
|
||||||
isDomainPkg: 'n',
|
|
||||||
medusaAppName: '',
|
|
||||||
domainCode: 'kS6SyH',
|
|
||||||
aecp: {
|
|
||||||
mdcDomain: '',
|
|
||||||
projectId: '',
|
|
||||||
appCode: '',
|
|
||||||
},
|
|
||||||
designerConfigs: {},
|
|
||||||
navConfig:
|
|
||||||
'{"appName":{"en_US":"基础包管理后台","key":"","type":"i18n","zh_CN":"基础包管理后台"},"bgColor":"white","data":[{"children":[],"hidden":false,"icon":"","inner":true,"navUuid":"FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V","relateUuid":"FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V","slug":"test","targetNew":false,"title":{"en_US":"测试","type":"i18n","zh_CN":"测试"}}],"isFixed":"y","isFold":"y","isFoldHorizontal":"n","languageChangeUrl":{"en_US":"/common/account/changeAccountLanguage.json","type":"i18n","zh_CN":"/common/account/changeAccountLanguage.json"},"layout":"auto","navStyle":"orange","navTheme":"light","openSubMode":false,"showAppTitle":true,"showCrumb":true,"showIcon":false,"showLanguageChange":true,"showNav":true,"showSearch":"n","singletons":{"FORM-3KYJN7RV-DIOD8LLK1WGQ89S7NHA92-QJVH497K-V":{"isFixed":"n","isFold":"n","isFoldHorizontal":"n","showAppTitle":false,"showCrumb":false,"showLanguageChange":false,"showNav":false,"showSearch":"n","singleton":false},"test":{"$ref":"$.singletons.FORM\\-3KYJN7RV\\-DIOD8LLK1WGQ89S7NHA92\\-QJVH497K\\-V"}},"type":"top_fold"}',
|
|
||||||
historyType: 'HASH',
|
|
||||||
isSinglePage: 'n',
|
|
||||||
rhino: 'n',
|
|
||||||
isMiniApp: '',
|
|
||||||
taskId: '',
|
|
||||||
appSchema: 'V5',
|
|
||||||
openSubMode: 'n',
|
|
||||||
};
|
|
||||||
window.g_config = {};
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<!-- lowcode engine globals -->
|
|
||||||
<div id="lce-container"></div>
|
|
||||||
<!-- vision 测试使用
|
|
||||||
|
|
||||||
-->
|
|
||||||
<script src="/js/editor-preset-vision.js"></script>
|
|
||||||
<script src="https://dev.g.alicdn.com/vision/visualengine-utils/5.0.0/engine-utils.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
|
|
||||||
<meta name="viewport" content="width=device-width" />
|
|
||||||
<title>LowCodeEngine DEMO</title>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/react/16.9.0/umd/react.development.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/react-dom/16.9.0/umd/react-dom.development.js"></script>
|
|
||||||
<script src="https://g.alicdn.com/code/lib/prop-types/15.7.2/prop-types.js"></script>
|
|
||||||
<script> React.PropTypes = PropTypes; </script>
|
|
||||||
<script src="https://g.alicdn.com/mylib/moment/2.24.0/min/moment.min.js"></script>
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://alifd.alicdn.com/npm/@alifd/next/1.11.6/next.min.css">
|
|
||||||
<script src="https://unpkg.alibaba-inc.com/@alifd/next@1.18.17/dist/next.min.js"></script>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div id="lce-container"></div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -29,7 +29,8 @@
|
|||||||
"react-is": "^16.10.1",
|
"react-is": "^16.10.1",
|
||||||
"serialize-javascript": "^1.7.0",
|
"serialize-javascript": "^1.7.0",
|
||||||
"socket.io-client": "^2.2.0",
|
"socket.io-client": "^2.2.0",
|
||||||
"whatwg-fetch": "^3.0.0"
|
"whatwg-fetch": "^3.0.0",
|
||||||
|
"zen-logger": "^1.1.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@alib/build-scripts": "^0.1.18",
|
"@alib/build-scripts": "^0.1.18",
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
import { cloneEnumerableProperty } from '@ali/lowcode-utils';
|
||||||
import adapter from '../adapter';
|
import adapter from '../adapter';
|
||||||
|
|
||||||
export function compWrapper(Comp: any) {
|
export function compWrapper(Comp: any) {
|
||||||
@ -8,15 +9,16 @@ export function compWrapper(Comp: any) {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { forwardRef } = this.props;
|
const { forwardRef, ...rest } = this.props;
|
||||||
|
|
||||||
return createElement(Comp, {
|
return createElement(Comp, {
|
||||||
...this.props,
|
...rest,
|
||||||
ref: forwardRef,
|
ref: forwardRef,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return forwardRef((props: any, ref: any) => {
|
return cloneEnumerableProperty(forwardRef((props: any, ref: any) => {
|
||||||
return createElement(Wrapper, { ...props, forwardRef: ref });
|
return createElement(Wrapper, { ...props, forwardRef: ref });
|
||||||
});
|
}), Comp);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,16 +1,10 @@
|
|||||||
import { BuiltinSimulatorHost, Node, PropChangeOptions } from '@ali/lowcode-designer';
|
import { BuiltinSimulatorHost, Node, PropChangeOptions } from '@ali/lowcode-designer';
|
||||||
import { GlobalEvent, TransformStage } from '@ali/lowcode-types';
|
import { GlobalEvent, TransformStage } from '@ali/lowcode-types';
|
||||||
import { isReactComponent } from '@ali/lowcode-utils';
|
import { isReactComponent, cloneEnumerableProperty } from '@ali/lowcode-utils';
|
||||||
import { EngineOptions } from '@ali/lowcode-editor-core';
|
import { EngineOptions } from '@ali/lowcode-editor-core';
|
||||||
import adapter from '../adapter';
|
import adapter from '../adapter';
|
||||||
import * as types from '../types/index';
|
import * as types from '../types/index';
|
||||||
|
|
||||||
const compDefaultPropertyNames = [
|
|
||||||
'$$typeof',
|
|
||||||
'render',
|
|
||||||
'defaultProps',
|
|
||||||
'props',
|
|
||||||
];
|
|
||||||
|
|
||||||
export interface IComponentHocInfo {
|
export interface IComponentHocInfo {
|
||||||
schema: any;
|
schema: any;
|
||||||
@ -315,8 +309,8 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
|
|
||||||
makeUnitRender() {
|
makeUnitRender() {
|
||||||
this.beforeRender(RerenderType.MinimalRenderUnit);
|
this.beforeRender(RerenderType.MinimalRenderUnit);
|
||||||
const nextProps = getProps(this.leaf?.export?.(TransformStage.Render) as types.ISchema, Comp, componentInfo);
|
const nextProps = getProps(this.leaf?.export?.(TransformStage.Render) as types.ISchema, scope, Comp, componentInfo);
|
||||||
const children = getChildren(this.leaf?.export?.(TransformStage.Render) as types.ISchema, Comp);
|
const children = getChildren(this.leaf?.export?.(TransformStage.Render) as types.ISchema, scope, Comp);
|
||||||
const nextState = {
|
const nextState = {
|
||||||
nextProps,
|
nextProps,
|
||||||
nodeChildren: children,
|
nodeChildren: children,
|
||||||
@ -358,6 +352,7 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
const dispose = leaf?.onPropChange?.((propChangeInfo: PropChangeOptions) => {
|
const dispose = leaf?.onPropChange?.((propChangeInfo: PropChangeOptions) => {
|
||||||
const {
|
const {
|
||||||
key,
|
key,
|
||||||
|
newValue = null,
|
||||||
} = propChangeInfo;
|
} = propChangeInfo;
|
||||||
const node = leaf;
|
const node = leaf;
|
||||||
|
|
||||||
@ -368,18 +363,24 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
container.rerender();
|
container.rerender();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
__debug(`${leaf?.componentName}[${this.props.componentId}] component trigger onPropsChange event`);
|
|
||||||
if (!this.shouldRenderSingleNode()) {
|
if (!this.shouldRenderSingleNode()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.beforeRender(RerenderType.PropsChanged);
|
this.beforeRender(RerenderType.PropsChanged);
|
||||||
const nextProps = getProps(node?.export?.(TransformStage.Render) as types.ISchema, scope, Comp, componentInfo);
|
const nodeProps = getProps(node?.export?.(TransformStage.Render) as types.ISchema, scope, Comp, componentInfo);
|
||||||
this.setState(nextProps.children ? {
|
const preNodeProps = this.state.nodeProps;
|
||||||
nodeChildren: nextProps.children,
|
const newNodeProps = {
|
||||||
nodeProps: nextProps,
|
...preNodeProps,
|
||||||
|
[key as string]: newValue,
|
||||||
|
...nodeProps,
|
||||||
|
};
|
||||||
|
__debug(`${leaf?.componentName}[${this.props.componentId}] component trigger onPropsChange event`, newNodeProps);
|
||||||
|
this.setState('children' in nodeProps ? {
|
||||||
|
nodeChildren: nodeProps.children,
|
||||||
|
nodeProps: newNodeProps,
|
||||||
|
childrenInState: true,
|
||||||
} : {
|
} : {
|
||||||
nodeProps: nextProps,
|
nodeProps: newNodeProps,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -395,11 +396,11 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
__debug(`${leaf?.componentName}[${this.props.componentId}] component trigger onVisibleChange event`);
|
|
||||||
if (!this.shouldRenderSingleNode()) {
|
if (!this.shouldRenderSingleNode()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__debug(`${leaf?.componentName}[${this.props.componentId}] component trigger onVisibleChange(${flag}) event`);
|
||||||
this.beforeRender(RerenderType.VisibleChanged);
|
this.beforeRender(RerenderType.VisibleChanged);
|
||||||
this.setState({
|
this.setState({
|
||||||
visible: flag,
|
visible: flag,
|
||||||
@ -418,7 +419,6 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
type,
|
type,
|
||||||
node,
|
node,
|
||||||
} = param || {};
|
} = param || {};
|
||||||
__debug(`${schema.componentName}[${this.props.componentId}] component trigger onChildrenChange event`);
|
|
||||||
if (!this.shouldRenderSingleNode()) {
|
if (!this.shouldRenderSingleNode()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -427,6 +427,7 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
// 缓存二级 children Next 查询筛选组件有问题
|
// 缓存二级 children Next 查询筛选组件有问题
|
||||||
// 缓存一级 children Next Tab 组件有问题
|
// 缓存一级 children Next Tab 组件有问题
|
||||||
const nextChild = getChildren(leaf?.export?.(TransformStage.Render) as types.ISchema, scope, Comp); // this.childrenMap
|
const nextChild = getChildren(leaf?.export?.(TransformStage.Render) as types.ISchema, scope, Comp); // this.childrenMap
|
||||||
|
__debug(`${schema.componentName}[${this.props.componentId}] component trigger onChildrenChange event`, nextChild);
|
||||||
this.setState({
|
this.setState({
|
||||||
nodeChildren: nextChild,
|
nodeChildren: nextChild,
|
||||||
childrenInState: true,
|
childrenInState: true,
|
||||||
@ -454,7 +455,7 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get children(): any {
|
get children(): any {
|
||||||
if (this.state.nodeChildren) {
|
if (this.state.childrenInState) {
|
||||||
return this.state.nodeChildren;
|
return this.state.nodeChildren;
|
||||||
}
|
}
|
||||||
if (this.props.children && !Array.isArray(this.props.children)) {
|
if (this.props.children && !Array.isArray(this.props.children)) {
|
||||||
@ -476,7 +477,7 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const {
|
const {
|
||||||
ref,
|
forwardedRef,
|
||||||
...rest
|
...rest
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
@ -485,27 +486,23 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
|
|||||||
...(this.state.nodeProps || {}),
|
...(this.state.nodeProps || {}),
|
||||||
children: [],
|
children: [],
|
||||||
__id: this.props.componentId,
|
__id: this.props.componentId,
|
||||||
ref: this.props.forwardedRef,
|
ref: forwardedRef,
|
||||||
};
|
};
|
||||||
|
|
||||||
return engine.createElement(Comp, compProps, this.hasChildren ? this.children : null);
|
return engine.createElement(Comp, compProps, this.hasChildren ? this.children : null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const LeafWrapper = forwardRef((props: any, ref: any) => (
|
let LeafWrapper = forwardRef((props: any, ref: any) => (
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
<LeafHoc {...props} forwardedRef={ref} ref={(ref) => cache.ref.set(props.componentId, ref)} />
|
<LeafHoc
|
||||||
|
{...props}
|
||||||
|
forwardedRef={ref}
|
||||||
|
ref={(_ref: any) => cache.ref.set(props.componentId, _ref)}
|
||||||
|
/>
|
||||||
));
|
));
|
||||||
|
|
||||||
if (typeof Comp === 'object') {
|
LeafWrapper = cloneEnumerableProperty(LeafWrapper, Comp);
|
||||||
const compExtraPropertyNames = Object.getOwnPropertyNames(Comp).filter(d => !compDefaultPropertyNames.includes(d));
|
|
||||||
|
|
||||||
__debug(`${schema.componentName} extra property names: ${compExtraPropertyNames.join(',')}`);
|
|
||||||
|
|
||||||
compExtraPropertyNames.forEach((d: string) => {
|
|
||||||
(LeafWrapper as any)[d] = Comp[d];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
LeafWrapper.displayName = (Comp as any).displayName;
|
LeafWrapper.displayName = (Comp as any).displayName;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
import classnames from 'classnames';
|
import classnames from 'classnames';
|
||||||
import Debug from 'debug';
|
|
||||||
import { create as createDataSourceEngine } from '@ali/lowcode-datasource-engine/interpret';
|
import { create as createDataSourceEngine } from '@ali/lowcode-datasource-engine/interpret';
|
||||||
import adapter from '../adapter';
|
import adapter from '../adapter';
|
||||||
import divFactory from '../components/Div';
|
import divFactory from '../components/Div';
|
||||||
@ -21,7 +20,7 @@ import {
|
|||||||
transformStringToFunction,
|
transformStringToFunction,
|
||||||
checkPropTypes,
|
checkPropTypes,
|
||||||
getI18n,
|
getI18n,
|
||||||
acceptsRef,
|
canAcceptsRef,
|
||||||
getFileCssName,
|
getFileCssName,
|
||||||
capitalizeFirstLetter,
|
capitalizeFirstLetter,
|
||||||
DataHelper,
|
DataHelper,
|
||||||
@ -31,6 +30,7 @@ import {
|
|||||||
import { IRendererProps, ISchema, IInfo, ComponentModel, IRenderer } from '../types';
|
import { IRendererProps, ISchema, IInfo, ComponentModel, IRenderer } from '../types';
|
||||||
import { compWrapper } from '../hoc';
|
import { compWrapper } from '../hoc';
|
||||||
import { IComponentConstruct, IComponentHoc, leafWrapper } from '../hoc/leaf';
|
import { IComponentConstruct, IComponentHoc, leafWrapper } from '../hoc/leaf';
|
||||||
|
import logger from '../utils/logger';
|
||||||
|
|
||||||
export default function baseRenererFactory() {
|
export default function baseRenererFactory() {
|
||||||
const { BaseRenderer: customBaseRenderer } = adapter.getRenderers();
|
const { BaseRenderer: customBaseRenderer } = adapter.getRenderers();
|
||||||
@ -44,7 +44,6 @@ export default function baseRenererFactory() {
|
|||||||
const VisualDom = visualDomFactory();
|
const VisualDom = visualDomFactory();
|
||||||
const AppContext = contextFactory();
|
const AppContext = contextFactory();
|
||||||
|
|
||||||
const debug = Debug('renderer:base');
|
|
||||||
const DESIGN_MODE = {
|
const DESIGN_MODE = {
|
||||||
EXTEND: 'extend',
|
EXTEND: 'extend',
|
||||||
BORDER: 'border',
|
BORDER: 'border',
|
||||||
@ -71,7 +70,6 @@ export default function baseRenererFactory() {
|
|||||||
this.__beforeInit(props);
|
this.__beforeInit(props);
|
||||||
this.__init(props);
|
this.__init(props);
|
||||||
this.__afterInit(props);
|
this.__afterInit(props);
|
||||||
this.__initDebug();
|
|
||||||
this.__debug(`constructor - ${props?.__schema?.fileName}`);
|
this.__debug(`constructor - ${props?.__schema?.fileName}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,7 +86,7 @@ export default function baseRenererFactory() {
|
|||||||
__afterInit(/* props: IRendererProps */) { }
|
__afterInit(/* props: IRendererProps */) { }
|
||||||
|
|
||||||
static getDerivedStateFromProps(props: IRendererProps, state: any) {
|
static getDerivedStateFromProps(props: IRendererProps, state: any) {
|
||||||
debug('getDerivedStateFromProps');
|
logger.log('getDerivedStateFromProps');
|
||||||
const func = props?.__schema?.lifeCycles?.getDerivedStateFromProps;
|
const func = props?.__schema?.lifeCycles?.getDerivedStateFromProps;
|
||||||
|
|
||||||
if (func) {
|
if (func) {
|
||||||
@ -356,7 +354,7 @@ export default function baseRenererFactory() {
|
|||||||
let Comp = __components[__schema.componentName];
|
let Comp = __components[__schema.componentName];
|
||||||
|
|
||||||
if (!Comp) {
|
if (!Comp) {
|
||||||
console.error(`${__schema.componentName} is invalid!`);
|
this.__debug(`${__schema.componentName} is invalid!`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.__createVirtualDom(_children, scope, ({
|
return this.__createVirtualDom(_children, scope, ({
|
||||||
@ -499,8 +497,8 @@ export default function baseRenererFactory() {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// 对于可以获取到ref的组件做特殊处理
|
// 对于不可以接收到 ref 的组件需要做特殊处理
|
||||||
if (!acceptsRef(Comp)) {
|
if (!canAcceptsRef(Comp)) {
|
||||||
Comp = compWrapper(Comp);
|
Comp = compWrapper(Comp);
|
||||||
components[schema.componentName] = Comp;
|
components[schema.componentName] = Comp;
|
||||||
}
|
}
|
||||||
@ -800,15 +798,7 @@ export default function baseRenererFactory() {
|
|||||||
return this.__instanceMap[filedId];
|
return this.__instanceMap[filedId];
|
||||||
}
|
}
|
||||||
|
|
||||||
__initDebug = () => {
|
__debug = logger.log;
|
||||||
this.__logger = Debug(`renderer:${this.__namespace || 'base'}`);
|
|
||||||
};
|
|
||||||
|
|
||||||
__debug = (msg = '') => {
|
|
||||||
if (this.__logger) {
|
|
||||||
this.__logger(`${this.__namespace}.${msg}`);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
__renderContextProvider = (customProps?: object, children?: any) => {
|
__renderContextProvider = (customProps?: object, children?: any) => {
|
||||||
customProps = customProps || {};
|
customProps = customProps || {};
|
||||||
|
|||||||
@ -141,7 +141,7 @@ export interface IRenderer {
|
|||||||
__createLoopVirtualDom: (schema: any, self: any, parentInfo: IInfo, idx: number | string) => any;
|
__createLoopVirtualDom: (schema: any, self: any, parentInfo: IInfo, idx: number | string) => any;
|
||||||
__parseProps: (props: any, self: any, path: string, info: IInfo) => any;
|
__parseProps: (props: any, self: any, path: string, info: IInfo) => any;
|
||||||
__initDebug: () => void;
|
__initDebug: () => void;
|
||||||
__debug: (msg: string) => void;
|
__debug: (...args: any[]) => void;
|
||||||
__renderContextProvider: (customProps?: object, children?: any) => any;
|
__renderContextProvider: (customProps?: object, children?: any) => any;
|
||||||
__renderContextConsumer: (children: any) => any;
|
__renderContextConsumer: (children: any) => any;
|
||||||
__renderContent: (children: any) => any;
|
__renderContent: (children: any) => any;
|
||||||
|
|||||||
@ -202,8 +202,8 @@ export function getI18n(key: string, values = {}, locale = 'zh-CN', messages = {
|
|||||||
* 判断当前组件是否能够设置ref
|
* 判断当前组件是否能够设置ref
|
||||||
* @param {*} Comp 需要判断的组件
|
* @param {*} Comp 需要判断的组件
|
||||||
*/
|
*/
|
||||||
export function acceptsRef(Comp: any) {
|
export function canAcceptsRef(Comp: any) {
|
||||||
return Comp?.$$typeof === REACT_FORWARD_REF_TYPE || Comp?.prototype?.isReactComponent || Comp?.prototype?.setState;
|
return Comp?.$$typeof === REACT_FORWARD_REF_TYPE || Comp?.prototype?.isReactComponent || Comp?.prototype?.setState || Comp._forwardRef;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
2
packages/renderer-core/src/utils/logger.ts
Normal file
2
packages/renderer-core/src/utils/logger.ts
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
import Logger from 'zen-logger';
|
||||||
|
export default new Logger({ level: 'warn', bizName: 'renderer' });
|
||||||
22
packages/utils/src/clone-enumerable-property.ts
Normal file
22
packages/utils/src/clone-enumerable-property.ts
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
const excludePropertyNames = [
|
||||||
|
'$$typeof',
|
||||||
|
'render',
|
||||||
|
'defaultProps',
|
||||||
|
'props',
|
||||||
|
'length',
|
||||||
|
'prototype',
|
||||||
|
'name',
|
||||||
|
'caller',
|
||||||
|
'callee',
|
||||||
|
'arguments',
|
||||||
|
];
|
||||||
|
|
||||||
|
export function cloneEnumerableProperty(target: any, origin: any) {
|
||||||
|
const compExtraPropertyNames = Object.keys(origin).filter(d => !excludePropertyNames.includes(d));
|
||||||
|
|
||||||
|
compExtraPropertyNames.forEach((d: string) => {
|
||||||
|
(target as any)[d] = origin[d];
|
||||||
|
});
|
||||||
|
|
||||||
|
return target;
|
||||||
|
}
|
||||||
@ -23,3 +23,4 @@ export * from './app-helper';
|
|||||||
export * from './misc';
|
export * from './misc';
|
||||||
export * from './schema';
|
export * from './schema';
|
||||||
export * from './node-helper';
|
export * from './node-helper';
|
||||||
|
export * from './clone-enumerable-property';
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import { ComponentClass, Component, FunctionComponent, ComponentType, createElement } from 'react';
|
import { ComponentClass, Component, FunctionComponent, ComponentType, createElement } from 'react';
|
||||||
|
import { cloneEnumerableProperty } from './clone-enumerable-property';
|
||||||
|
|
||||||
const hasSymbol = typeof Symbol === 'function' && Symbol.for;
|
const hasSymbol = typeof Symbol === 'function' && Symbol.for;
|
||||||
const REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
|
const REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
|
||||||
@ -20,11 +21,12 @@ export function isReactComponent(obj: any): obj is ComponentType<any> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function wrapReactClass(view: FunctionComponent) {
|
export function wrapReactClass(view: FunctionComponent) {
|
||||||
const ViewComponentClass = class extends Component {
|
let ViewComponentClass = class extends Component {
|
||||||
render() {
|
render() {
|
||||||
return createElement(view, this.props);
|
return createElement(view, this.props);
|
||||||
}
|
}
|
||||||
} as any;
|
} as any;
|
||||||
|
ViewComponentClass = cloneEnumerableProperty(ViewComponentClass, view);
|
||||||
ViewComponentClass.displayName = view.displayName;
|
ViewComponentClass.displayName = view.displayName;
|
||||||
return ViewComponentClass;
|
return ViewComponentClass;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -718,7 +718,6 @@ export function upgradeMetadata(oldConfig: OldPrototypeConfig) {
|
|||||||
docUrl,
|
docUrl,
|
||||||
devMode: devMode || 'procode',
|
devMode: devMode || 'procode',
|
||||||
schema: schema?.componentsTree[0],
|
schema: schema?.componentsTree[0],
|
||||||
// isMinimalRenderUnit,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (category) {
|
if (category) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user