update

DPDFE · Mar 15, 2024 · b482e34 · b482e34
1 parent 3a83355
commit b482e34
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/packages/event/package.json b/packages/event/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dpdfe/event-utils",
-    "version": "0.0.33",
+    "version": "0.0.34",
     "description": "通用方法",
     "author": "pearone",
     "homepage": "https://github.com/DPDFE/react-layout/tree/main/packages/event",

diff --git a/packages/event/src/index.ts b/packages/event/src/index.ts
@@ -6,6 +6,16 @@ export {
     matchesSelectorAndParentsTo
 } from './event';
 
+export {
+    isNumber,
+    formatFloatNumber,
+    toFixedNumber,
+    formatNumberToPercentString,
+    getThousandthSeparatedNumber,
+    formatNumberUnit,
+    readableNumbers
+} from './data';
+
 export { default as LocalStorage } from './localstorage';
 
 export { default as Events } from './eventbus';

diff --git a/packages/react-layout/package.json b/packages/react-layout/package.json
@@ -2,7 +2,7 @@
     "name": "@dpdfe/react-layout",
     "description": "react layout",
     "author": "pearone stefan-hui",
-    "version": "2.3.2",
+    "version": "2.4.0",
     "online_version": "2.0.27",
     "dev_version": "2.1.21",
     "license": "MIT",
@@ -39,7 +39,7 @@
         "pub": "npm publish"
     },
     "dependencies": {
-        "@dpdfe/event-utils": "^0.0.15",
+        "@dpdfe/event-utils": "^0.0.34",
         "@types/lodash.isequal": "^4.5.5",
         "@types/resize-observer-browser": "^0.1.7",
         "classnames": "^2.3.1",

diff --git a/packages/react-layout/src/component/canvas/draggable.tsx b/packages/react-layout/src/component/canvas/draggable.tsx
@@ -3,7 +3,7 @@ import {
     addEvent,
     removeEvent,
     matchesSelectorAndParentsTo
-} from '@dpdfe/event-utils/dist/utils';
+} from '@dpdfe/event-utils';
 import classNames from 'classnames';
 import React, {
     DOMElement,

diff --git a/packages/react-layout/src/component/canvas/layout-item.tsx b/packages/react-layout/src/component/canvas/layout-item.tsx
@@ -55,8 +55,6 @@ const WidgetItem = (props: WidgetItemProps) => {
         setCurrentChecked
     } = useContext(LayoutContext);
 
-    console.log(props.pos);
-
     // 滚动到顶
     const scrollToTop = (e: MouseEvent) => {
         if (props.not_use_edge_scroll) {

diff --git a/packages/react-layout/src/component/canvas/scroll.ts b/packages/react-layout/src/component/canvas/scroll.ts
@@ -1,5 +1,5 @@
 import { Position } from '@/interfaces';
-import { addEvent, removeEvent } from '@dpdfe/event-utils/dist/utils';
+import { addEvent, removeEvent } from '@dpdfe/event-utils';
 import { useEffect, useMemo, useState } from 'react';
 
 export function useScroll(target: any) {

diff --git a/packages/react-layout/src/component/guide-line/index.tsx b/packages/react-layout/src/component/guide-line/index.tsx
@@ -1,9 +1,5 @@
 import { DirectionType, GuideLineProps, RulerPointer } from '@/interfaces';
-import {
-    addEvent,
-    formatFloatNumber,
-    removeEvent
-} from '@dpdfe/event-utils/dist/utils';
+import { addEvent, formatFloatNumber, removeEvent } from '@dpdfe/event-utils';
 import React, { memo, useEffect, useState } from 'react';
 import Menus, { MenuItem } from '../menus';
 import styles from './styles.module.css';

diff --git a/packages/react-layout/src/component/horizontal-ruler/index.tsx b/packages/react-layout/src/component/horizontal-ruler/index.tsx
@@ -8,7 +8,7 @@ import {
 import * as React from 'react';
 import { useEffect, useState } from 'react';
 import styles from './styles.module.css';
-import { addEvent, removeEvent } from '@dpdfe/event-utils/dist/utils';
+import { addEvent, removeEvent } from '@dpdfe/event-utils';
 
 const HorizontalRuler = (props: HorizontalRulerProps) => {
     const [x_offset, setXOffset] = useState<number[]>([]); // 尺子水平间隔

diff --git a/packages/react-layout/src/component/vertical-ruler/index.tsx b/packages/react-layout/src/component/vertical-ruler/index.tsx
@@ -6,7 +6,7 @@ import {
 } from '@/component/layout/context/calc';
 import React, { useEffect, useState } from 'react';
 import styles from './styles.module.css';
-import { addEvent, removeEvent } from '@dpdfe/event-utils/dist/utils';
+import { addEvent, removeEvent } from '@dpdfe/event-utils';
 
 const VerticalRuler = (props: VerticalRulerProps) => {
     const [y_offset, setYOffset] = useState<number[]>([]); // 尺子垂直间隔

diff --git a/yarn.lock b/yarn.lock
@@ -1449,11 +1449,6 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@dpdfe/event-utils@^0.0.15":
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/@dpdfe/event-utils/-/event-utils-0.0.15.tgz#7bcccda666120d72659ca392afd9e05082014f26"
-  integrity sha512-vxZO8jbFE9kIaZnbZgnTtt20/SGTGUGRS12jrZagsO8UmYZusniqTbeGNJI61xoAhXpW8fqvKPIVt8qFSJpcaQ==
-
 "@dpdfe/react-layout@link:./packages/react-layout":
   version "0.0.0"
   uid ""