guoshujing/dooring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 0.7.0

Browse Source
This commit is contained in:
hufeixiong
2021-07-27 15:38:29 +08:00
parent a0f469c9a0
commit 0619bdfc81
18 changed files with 67 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/dooringx-lib/src/components/container.tsx
View File

@@ -67,7 +67,7 @@ function Container(props: PropsWithChildren<ContainerProps>) {
{...(props.context === 'edit' ? containerFocusRemove(props.config) : null)}
>
{props.context === 'edit' && (
<NormalMarkLineRender config={props.config}></NormalMarkLineRender>
<NormalMarkLineRender config={props.config} iframe={false}></NormalMarkLineRender>
)}
{props.state.block.map((v) => {
return (

8
packages/dooringx-lib/src/components/iframeContainer.tsx
View File

@@ -2,13 +2,12 @@
* @Author: yehuozhili
* @Date: 2021-07-17 10:08:08
* @LastEditors: yehuozhili
* @LastEditTime: 2021-07-20 16:26:24
* @LastEditTime: 2021-07-27 14:42:00
* @FilePath: \dooringx\packages\dooringx-lib\src\components\iframeContainer.tsx
*/
import { containerDragResolve } from '../core/crossDrag';
import { containerFocusRemove } from '../core/focusHandler';
import { innerContainerDrag } from '../core/innerDrag';
import { NormalMarkLineRender } from '../core/markline';
import { IStoreData } from '../core/store/storetype';
import { wrapperMoveState } from './IframeWrapperMove/event';
import { CSSProperties, PropsWithChildren, useEffect, useMemo, useState } from 'react';
@@ -125,11 +124,8 @@ function Container(props: PropsWithChildren<ContainerProps>) {
}}
{...(props.context === 'edit' ? containerDragResolve(props.config) : null)}
{...(props.context === 'edit' ? innerContainerDrag(props.config) : null)}
{...(props.context === 'edit' ? containerFocusRemove(props.config, true) : null)}
{...(props.context === 'edit' ? containerFocusRemove(props.config) : null)}
>
{props.context === 'edit' && (
<NormalMarkLineRender config={props.config}></NormalMarkLineRender>
)}
{state.block.map((v) => {
return (
<Blocks

6
packages/dooringx-lib/src/components/iframeTarget.tsx
View File

@@ -2,7 +2,7 @@
* @Author: yehuozhili
* @Date: 2021-07-20 10:36:55
* @LastEditors: yehuozhili
* @LastEditTime: 2021-07-20 16:13:07
* @LastEditTime: 2021-07-27 15:13:35
* @FilePath: \dooringx\packages\dooringx-lib\src\components\iframeTarget.tsx
*/
import React from 'react';
@@ -10,6 +10,7 @@ import UserConfig from '../config';
import { containerDragResolve } from '../core/crossDrag';
import { containerFocusRemove } from '../core/focusHandler';
import { innerContainerDrag } from '../core/innerDrag';
import { NormalMarkLineRender } from '../core/markline';
import { containerResizer } from '../core/resizeHandler/containerResizer';
import Blocks from './blocks';
@@ -35,7 +36,7 @@ export function IframeTarget(props: IframeTargetProps) {
<div
{...containerDragResolve(props.config)}
{...innerContainerDrag(props.config)}
{...containerFocusRemove(props.config, true)}
{...containerFocusRemove(props.config)}
style={{
width: state.container.width * scaleState.value,
height: state.container.height * scaleState.value,
@@ -64,6 +65,7 @@ export function IframeTarget(props: IframeTargetProps) {
></Blocks>
);
})}
{<NormalMarkLineRender config={props.config} iframe={true}></NormalMarkLineRender>}
</div>
</div>
<iframe