From 601ebbbc437fe10783faec0cf2a5bac49c080c89 Mon Sep 17 00:00:00 2001 From: hufeixiong <673632758@qq.com> Date: Tue, 13 Jul 2021 21:18:22 +0800 Subject: [PATCH] update 0.4.2 --- packages/dooringx-doc/src/changelog/1.1.md | 8 ++++ packages/dooringx-lib/README.md | 9 +++- .../dooringx-lib/src/components/blocks.tsx | 4 +- .../src/components/rightConfig.tsx | 47 ++++++++++++++++--- .../src/components/wrapperMove/ticker.tsx | 13 ++++- .../dooringx-lib/src/core/markline/index.tsx | 6 +-- .../src/core/resizeHandler/index.tsx | 1 + 7 files changed, 74 insertions(+), 14 deletions(-) diff --git a/packages/dooringx-doc/src/changelog/1.1.md b/packages/dooringx-doc/src/changelog/1.1.md index bb841ee..2bb00a8 100644 --- a/packages/dooringx-doc/src/changelog/1.1.md +++ b/packages/dooringx-doc/src/changelog/1.1.md @@ -3,6 +3,14 @@ title: CHANGELOG order: 1 --- +## 0.4.2 + +修复animate错误初始值。 + +修改markline样式。 + +全局设置增加容器高度。 + ## 0.4.1 去除lib自动导入样式。 diff --git a/packages/dooringx-lib/README.md b/packages/dooringx-lib/README.md index c80145f..cdebe95 100644 --- a/packages/dooringx-lib/README.md +++ b/packages/dooringx-lib/README.md @@ -2,13 +2,20 @@ * @Author: yehuozhili * @Date: 2021-01-31 20:44:16 * @LastEditors: yehuozhili - * @LastEditTime: 2021-07-13 15:31:15 + * @LastEditTime: 2021-07-13 21:09:41 * @FilePath: \dooringx\packages\dooringx-lib\README.md --> ## Dooringx-lib ## changelog +## 0.4.2 + +修复animate错误初始值。 + +修改markline样式。 + +全局设置增加容器高度。 ## 0.4.1 去除lib自动导入样式。 diff --git a/packages/dooringx-lib/src/components/blocks.tsx b/packages/dooringx-lib/src/components/blocks.tsx index 556ff80..5388f12 100644 --- a/packages/dooringx-lib/src/components/blocks.tsx +++ b/packages/dooringx-lib/src/components/blocks.tsx @@ -104,11 +104,10 @@ function Blocks(props: PropsWithChildren) { }, [props.data.animate]); const animateCount = useMemo(() => { const animate = props.data.animate; - if (Object.keys(animate).length > 0) { return { animationIterationCount: animate.animationIterationCount }; } - return { animationIterationCount: 1 }; + return { animationIterationCount: '' }; }, [props.data.animate]); const render = useMemo(() => { @@ -185,6 +184,7 @@ function Blocks(props: PropsWithChildren) { state, props.context, props.data, + props.config, innerDragData, animatecss, animateCount, diff --git a/packages/dooringx-lib/src/components/rightConfig.tsx b/packages/dooringx-lib/src/components/rightConfig.tsx index 52c7b71..3dccdd3 100644 --- a/packages/dooringx-lib/src/components/rightConfig.tsx +++ b/packages/dooringx-lib/src/components/rightConfig.tsx @@ -2,14 +2,14 @@ * @Author: yehuozhili * @Date: 2021-03-14 05:42:13 * @LastEditors: yehuozhili - * @LastEditTime: 2021-07-12 20:36:30 + * @LastEditTime: 2021-07-13 21:08:46 * @FilePath: \dooringx\packages\dooringx-lib\src\components\rightConfig.tsx */ import { CreateOptionsRes } from '../core/components/formTypes'; import { IBlockType, IStoreData } from '../core/store/storetype'; import { PropsWithChildren, useEffect, useMemo, useState } from 'react'; import React from 'react'; -import { Tabs, Input, Row, Col, Checkbox } from 'antd'; +import { Tabs, Input, Row, Col, Checkbox, InputNumber } from 'antd'; import UserConfig from '../config'; import { RGBColor, SketchPicker } from 'react-color'; import { rgba2Obj } from '../core/utils'; @@ -151,9 +151,13 @@ function RightConfig(props: PropsWithChildren) { )} {!current && !isEdit && !customGlobal && (
- 全局设置 + + 全局设置 + - 标题 + + 标题 + ) { - 容器底色 + + 容器高度 + + + { + const val = e; + console.log(val, 'kkkk'); + const isEdit = props.config.getStoreChanger().isEdit(); + if (isEdit) { + const originData: IStoreData = deepcopy( + props.config.getStoreChanger().getOrigin()!.now + ); + originData.container.height = val; + props.config.getStoreChanger().updateOrigin(originData); + } else { + const originData = deepcopy(props.config.getStore().getData()); + originData.container.height = val; + props.config.getStore().setData(originData); + } + }} + /> + + + + + 容器底色 + {
@@ -243,7 +276,9 @@ function RightConfig(props: PropsWithChildren) { - body底色 + + body底色 + {
diff --git a/packages/dooringx-lib/src/components/wrapperMove/ticker.tsx b/packages/dooringx-lib/src/components/wrapperMove/ticker.tsx index ebb9cde..a38eadf 100644 --- a/packages/dooringx-lib/src/components/wrapperMove/ticker.tsx +++ b/packages/dooringx-lib/src/components/wrapperMove/ticker.tsx @@ -2,7 +2,7 @@ * @Author: yehuozhili * @Date: 2021-07-12 15:54:35 * @LastEditors: yehuozhili - * @LastEditTime: 2021-07-12 19:21:35 + * @LastEditTime: 2021-07-13 21:07:22 * @FilePath: \dooringx\packages\dooringx-lib\src\components\wrapperMove\ticker.tsx */ import React, { useEffect, useRef, useState } from 'react'; @@ -51,6 +51,7 @@ function Ticker(props: { config: UserConfig }) { height: width, display: 'flex', justifyContent: 'space-between', + userSelect: 'none', }} > {Array(topRender) @@ -65,6 +66,7 @@ function Ticker(props: { config: UserConfig }) { width: '1px', height: '12px', position: 'relative', + userSelect: 'none', }} >
{Array(leftRender) @@ -115,6 +118,7 @@ function Ticker(props: { config: UserConfig }) { width: '12px', height: '1px', position: 'relative', + userSelect: 'none', }} >
); } diff --git a/packages/dooringx-lib/src/core/markline/index.tsx b/packages/dooringx-lib/src/core/markline/index.tsx index 15c6df1..9b8dc02 100644 --- a/packages/dooringx-lib/src/core/markline/index.tsx +++ b/packages/dooringx-lib/src/core/markline/index.tsx @@ -2,7 +2,7 @@ * @Author: yehuozhili * @Date: 2021-03-14 04:29:09 * @LastEditors: yehuozhili - * @LastEditTime: 2021-07-12 20:59:27 + * @LastEditTime: 2021-07-13 20:38:59 * @FilePath: \dooringx\packages\dooringx-lib\src\core\markline\index.tsx */ import React from 'react'; @@ -37,7 +37,7 @@ export function MarklineX(props: any) {
{ return (
{ onMouseDown(e, v, props.data, props.rect, props.config);