From 1f35b595dfb0e15644fb338e881c53362c433d13 Mon Sep 17 00:00:00 2001 From: xg15472 Date: Mon, 21 Oct 2024 10:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/antd-demo/src/utils/index.tsx | 15 +- packages/antd-demo/tsconfig.json | 6 +- packages/antd/package.json | 424 +++++++++++++++++- .../src/button-wrapper/button-wrapper.tsx | 3 +- .../config-provider-wrapper.tsx | 4 +- .../date-picker-wrapper.tsx | 18 +- .../date-range-picker-wrapper.tsx | 7 +- .../dropdown-menu-wrapper.tsx | 4 +- .../src/rich-text-viewer/rich-text-viewer.tsx | 1 - .../time-picker-wrapper.tsx | 14 +- packages/pro-layout/package.json | 8 +- packages/pro-layout/tsconfig.json | 5 +- .../src/array/array-field-to-label-value.ts | 4 +- packages/utils/src/array/array-filter.ts | 2 +- packages/utils/src/array/array-find-index.ts | 2 +- packages/utils/src/array/array-find.ts | 2 +- packages/utils/src/array/array-max.ts | 2 +- packages/utils/src/array/array-min.ts | 2 +- packages/utils/src/array/array-pick.ts | 4 +- packages/utils/src/array/array-reorder.ts | 2 +- packages/utils/src/array/array-split.ts | 2 +- packages/utils/src/array/array-total.ts | 2 +- packages/utils/src/array/index.ts | 30 +- packages/utils/src/array/list-in-list.ts | 4 +- packages/utils/src/array/to-array.ts | 2 +- .../src/array/two-array-element-change.ts | 2 +- packages/utils/src/date/compare.ts | 4 +- packages/utils/src/date/date-detail.ts | 4 +- packages/utils/src/date/date-new.ts | 4 +- packages/utils/src/date/date-normalize.ts | 2 +- packages/utils/src/date/format.ts | 6 +- packages/utils/src/date/index.ts | 14 +- packages/utils/src/date/is-date.ts | 4 +- packages/utils/src/dom/index.ts | 6 +- packages/utils/src/image/image-compress.ts | 6 +- packages/utils/src/image/index.ts | 6 +- packages/utils/src/index.ts | 38 +- packages/utils/src/lang/index.ts | 2 +- packages/utils/src/number/index.ts | 2 +- packages/utils/src/object/index.ts | 6 +- packages/utils/src/object/map-to-list.ts | 2 +- .../utils/src/object/object-get-object.ts | 2 +- packages/utils/src/polyfill/index.ts | 4 +- packages/utils/src/price/fen2wan.ts | 2 +- packages/utils/src/price/fen2yuan.ts | 2 +- packages/utils/src/price/format.ts | 2 +- packages/utils/src/price/index.ts | 16 +- packages/utils/src/price/remove-zero.ts | 2 +- packages/utils/src/price/split.ts | 2 +- packages/utils/src/price/wan2fen.ts | 2 +- packages/utils/src/price/yuan2fen.ts | 2 +- packages/utils/src/props/compose-props.ts | 2 +- packages/utils/src/props/index.ts | 4 +- packages/utils/src/sentry/index.ts | 2 +- packages/utils/src/string/cut-string.ts | 2 +- packages/utils/src/string/format.ts | 2 +- .../utils/src/string/get-value-or-default.ts | 2 +- packages/utils/src/string/index.ts | 16 +- packages/utils/src/string/value-is-equal.ts | 4 +- packages/utils/src/system/index.ts | 8 +- packages/utils/src/system/window.ts | 4 +- packages/utils/src/table/index.ts | 1 + packages/utils/src/table/index.tsx | 1 - packages/utils/src/table/merge-cell.ts | 4 +- packages/utils/src/tree/index.ts | 12 +- packages/utils/src/tree/tree-field-change.ts | 2 +- packages/utils/src/tree/tree-filter.ts | 6 +- packages/utils/src/tree/tree-item-detete.ts | 6 +- .../utils/src/tree/tree-leaf-parents-array.ts | 4 +- packages/utils/src/tree/tree-to-array.ts | 2 +- .../utils/src/tree/tree-to-tiled-array.ts | 4 +- packages/utils/src/types/index.ts | 6 +- packages/utils/src/uri/get-module-url.ts | 8 +- packages/utils/src/uri/index.ts | 20 +- packages/utils/src/uri/path-compare.ts | 2 +- packages/utils/src/uri/remove-slash.ts | 2 +- .../utils/src/uri/to-link-path-with-query.ts | 2 +- packages/utils/src/uri/to-link-path.ts | 5 +- packages/utils/src/uri/url-route.ts | 6 +- packages/utils/src/validator/index.ts | 4 +- packages/utils/src/validator/is-18idcard.ts | 2 +- packages/utils/tsconfig.json | 3 +- yarn.lock | 35 ++ 83 files changed, 681 insertions(+), 215 deletions(-) create mode 100644 packages/utils/src/table/index.ts delete mode 100644 packages/utils/src/table/index.tsx diff --git a/packages/antd-demo/src/utils/index.tsx b/packages/antd-demo/src/utils/index.tsx index e1645e5..6fa1fec 100644 --- a/packages/antd-demo/src/utils/index.tsx +++ b/packages/antd-demo/src/utils/index.tsx @@ -1,5 +1,12 @@ -import { createRoot } from 'react-dom/client'; +import { bootstrap } from '@hyperse/pro-layout'; import { Demo } from './Demo'; -import './index.less'; - -createRoot(document.getElementById('app')!).render(); +bootstrap({ + layoutMode: 'no-layout', + routeList: [ + { + path: '/', + element: , + breadConfig: 'demo1列表', + }, + ], +}); diff --git a/packages/antd-demo/tsconfig.json b/packages/antd-demo/tsconfig.json index fe361b8..4d689b4 100644 --- a/packages/antd-demo/tsconfig.json +++ b/packages/antd-demo/tsconfig.json @@ -9,11 +9,7 @@ "incremental": true, "module": "ESNext", "target": "ESNext", - "moduleResolution": "node", - "paths": { - "@hyperse/antd": ["../antd/src"], - "@hyperse/utils": ["../utils/src"] - } + "moduleResolution": "node" }, "exclude": ["node_modules", "**/.*/", "dist", "build", "public"] } diff --git a/packages/antd/package.json b/packages/antd/package.json index 143c11a..c5efd24 100644 --- a/packages/antd/package.json +++ b/packages/antd/package.json @@ -9,13 +9,425 @@ "import": "./index.js", "types": "./dist/index.d.ts" }, - "./load-image": { - "types": "./dist/load-image/index.d.ts", - "import": "./dist/load-image/index.js" + "./alert-wrapper": { + "types": "./dist/alert-wrapper/index.d.ts", + "import": "./dist/alert-wrapper/index.js" }, - "./utils": { - "types": "./dist/utils/index.d.ts", - "import": "./dist/utils/index.js" + "./amount-fen-input": { + "types": "./dist/amount-fen-input/index.d.ts", + "import": "./dist/amount-fen-input/index.js" + }, + "./amount-fen-input-form-item": { + "types": "./dist/amount-fen-input-form-item/index.d.ts", + "import": "./dist/amount-fen-input-form-item/index.js" + }, + "./anchor-steps": { + "types": "./dist/anchor-steps/index.d.ts", + "import": "./dist/anchor-steps/index.js" + }, + "./block-layout": { + "types": "./dist/block-layout/index.d.ts", + "import": "./dist/block-layout/index.js" + }, + "./bootstrap": { + "types": "./dist/bootstrap/index.d.ts", + "import": "./dist/bootstrap/index.js" + }, + "./box-grid": { + "types": "./dist/box-grid/index.d.ts", + "import": "./dist/box-grid/index.js" + }, + "./button-operate": { + "types": "./dist/button-operate/index.d.ts", + "import": "./dist/button-operate/index.js" + }, + "./button-wrapper": { + "types": "./dist/button-wrapper/index.d.ts", + "import": "./dist/button-wrapper/index.js" + }, + "./card-layout": { + "types": "./dist/card-layout/index.d.ts", + "import": "./dist/card-layout/index.js" + }, + "./card-wrapper": { + "types": "./dist/card-wrapper/index.d.ts", + "import": "./dist/card-wrapper/index.js" + }, + "./cascader-wrapper": { + "types": "./dist/cascader-wrapper/index.d.ts", + "import": "./dist/cascader-wrapper/index.js" + }, + "./check-list": { + "types": "./dist/check-list/index.d.ts", + "import": "./dist/check-list/index.js" + }, + "./checkbox-wrapper": { + "types": "./dist/checkbox-wrapper/index.d.ts", + "import": "./dist/checkbox-wrapper/index.js" + }, + "./color-picker-wrapper": { + "types": "./dist/color-picker-wrapper/index.d.ts", + "import": "./dist/color-picker-wrapper/index.js" + }, + "./config-provider-wrapper": { + "types": "./dist/config-provider-wrapper/index.d.ts", + "import": "./dist/config-provider-wrapper/index.js" + }, + "./css-node-hover": { + "types": "./dist/css-node-hover/index.d.ts", + "import": "./dist/css-node-hover/index.js" + }, + "./data-render": { + "types": "./dist/data-render/index.d.ts", + "import": "./dist/data-render/index.js" + }, + "./date-picker-wrapper": { + "types": "./dist/date-picker-wrapper/index.d.ts", + "import": "./dist/date-picker-wrapper/index.js" + }, + "./date-range-picker-wrapper-form-item": { + "types": "./dist/date-range-picker-wrapper-form-item/index.d.ts", + "import": "./dist/date-range-picker-wrapper-form-item/index.js" + }, + "./dialog-alert": { + "types": "./dist/dialog-alert/index.d.ts", + "import": "./dist/dialog-alert/index.js" + }, + "./dialog-confirm": { + "types": "./dist/dialog-confirm/index.d.ts", + "import": "./dist/dialog-confirm/index.js" + }, + "./dialog-drawer": { + "types": "./dist/dialog-drawer/index.d.ts", + "import": "./dist/dialog-drawer/index.js" + }, + "./dialog-drawer-content": { + "types": "./dist/dialog-drawer-content/index.d.ts", + "import": "./dist/dialog-drawer-content/index.js" + }, + "./dialog-loading": { + "types": "./dist/dialog-loading/index.d.ts", + "import": "./dist/dialog-loading/index.js" + }, + "./dialog-modal": { + "types": "./dist/dialog-modal/index.d.ts", + "import": "./dist/dialog-modal/index.js" + }, + "./drag-collapse": { + "types": "./dist/drag-collapse/index.d.ts", + "import": "./dist/drag-collapse/index.js" + }, + "./drag-collapse-form-list": { + "types": "./dist/drag-collapse-form-list/index.d.ts", + "import": "./dist/drag-collapse-form-list/index.js" + }, + "./drag-editable-table": { + "types": "./dist/drag-editable-table/index.d.ts", + "import": "./dist/drag-editable-table/index.js" + }, + "./drag-form-list": { + "types": "./dist/drag-form-list/index.d.ts", + "import": "./dist/drag-form-list/index.js" + }, + "./drag-table": { + "types": "./dist/drag-table/index.d.ts", + "import": "./dist/drag-table/index.js" + }, + "./dropdown-menu-wrapper": { + "types": "./dist/dropdown-menu-wrapper/index.d.ts", + "import": "./dist/dropdown-menu-wrapper/index.js" + }, + "./dynamic-node": { + "types": "./dist/dynamic-node/index.d.ts", + "import": "./dist/dynamic-node/index.js" + }, + "./easy-form": { + "types": "./dist/easy-form/index.d.ts", + "import": "./dist/easy-form/index.js" + }, + "./easy-table": { + "types": "./dist/easy-table/index.d.ts", + "import": "./dist/easy-table/index.js" + }, + "./editable-field": { + "types": "./dist/editable-field/index.d.ts", + "import": "./dist/editable-field/index.js" + }, + "./editable-field-provider": { + "types": "./dist/editable-field-provider/index.d.ts", + "import": "./dist/editable-field-provider/index.js" + }, + "./editable-table": { + "types": "./dist/editable-table/index.d.ts", + "import": "./dist/editable-table/index.js" + }, + "./error-boundary-wrapper": { + "types": "./dist/error-boundary-wrapper/index.d.ts", + "import": "./dist/error-boundary-wrapper/index.js" + }, + "./fba-app": { + "types": "./dist/fba-app/index.d.ts", + "import": "./dist/fba-app/index.js" + }, + "./fba-hooks": { + "types": "./dist/fba-hooks/index.d.ts", + "import": "./dist/fba-hooks/index.js" + }, + "./fba-utils": { + "types": "./dist/fba-utils/index.d.ts", + "import": "./dist/fba-utils/index.js" + }, + "./file-export": { + "types": "./dist/file-export/index.d.ts", + "import": "./dist/file-export/index.js" + }, + "./file-import": { + "types": "./dist/file-import/index.d.ts", + "import": "./dist/file-import/index.js" + }, + "./file-select": { + "types": "./dist/file-select/index.d.ts", + "import": "./dist/file-select/index.js" + }, + "./flex-layout": { + "types": "./dist/flex-layout/index.d.ts", + "import": "./dist/flex-layout/index.js" + }, + "./form-grid": { + "types": "./dist/form-grid/index.d.ts", + "import": "./dist/form-grid/index.js" + }, + "./form-item-group": { + "types": "./dist/form-item-group/index.d.ts", + "import": "./dist/form-item-group/index.js" + }, + "./form-item-hidden": { + "types": "./dist/form-item-hidden/index.d.ts", + "import": "./dist/form-item-hidden/index.js" + }, + "./form-item-text": { + "types": "./dist/form-item-text/index.d.ts", + "import": "./dist/form-item-text/index.js" + }, + "./form-item-wrapper": { + "types": "./dist/form-item-wrapper/index.d.ts", + "import": "./dist/form-item-wrapper/index.js" + }, + "./form-list-wrapper": { + "types": "./dist/form-list-wrapper/index.d.ts", + "import": "./dist/form-list-wrapper/index.js" + }, + "./form-wrapper": { + "types": "./dist/form-wrapper/index.d.ts", + "import": "./dist/form-wrapper/index.js" + }, + "./gap": { + "types": "./dist/gap/index.d.ts", + "import": "./dist/gap/index.js" + }, + "./icon-wrapper": { + "types": "./dist/icon-wrapper/index.d.ts", + "import": "./dist/icon-wrapper/index.js" + }, + "./input-search-wrapper": { + "types": "./dist/input-search-wrapper/index.d.ts", + "import": "./dist/input-search-wrapper/index.js" + }, + "./input-text-area-wrapper": { + "types": "./dist/input-text-area-wrapper/index.d.ts", + "import": "./dist/input-text-area-wrapper/index.js" + }, + "./input-wrapper": { + "types": "./dist/input-wrapper/index.d.ts", + "import": "./dist/input-wrapper/index.js" + }, + "./label-value-render": { + "types": "./dist/label-value-render/index.d.ts", + "import": "./dist/label-value-render/index.js" + }, + "./local-loading": { + "types": "./dist/local-loading/index.d.ts", + "import": "./dist/local-loading/index.js" + }, + "./mention-editor": { + "types": "./dist/mention-editor/index.d.ts", + "import": "./dist/mention-editor/index.js" + }, + "./mentions-wrapper": { + "types": "./dist/mentions-wrapper/index.d.ts", + "import": "./dist/mentions-wrapper/index.js" + }, + "./modal-action": { + "types": "./dist/modal-action/index.d.ts", + "import": "./dist/modal-action/index.js" + }, + "./page-fixed-footer": { + "types": "./dist/page-fixed-footer/index.d.ts", + "import": "./dist/page-fixed-footer/index.js" + }, + "./page404": { + "types": "./dist/page404/index.d.ts", + "import": "./dist/page404/index.js" + }, + "./pagination-wrapper": { + "types": "./dist/pagination-wrapper/index.d.ts", + "import": "./dist/pagination-wrapper/index.js" + }, + "./pdf": { + "types": "./dist/pdf/index.d.ts", + "import": "./dist/pdf/index.js" + }, + "./pdf-preview": { + "types": "./dist/pdf-preview/index.d.ts", + "import": "./dist/pdf-preview/index.js" + }, + "./permission": { + "types": "./dist/permission/index.d.ts", + "import": "./dist/permission/index.js" + }, + "./pre-defined-class-name": { + "types": "./dist/pre-defined-class-name/index.d.ts", + "import": "./dist/pre-defined-class-name/index.js" + }, + "./radio-group-wrapper": { + "types": "./dist/radio-group-wrapper/index.d.ts", + "import": "./dist/radio-group-wrapper/index.js" + }, + "./relation-tree": { + "types": "./dist/relation-tree/index.d.ts", + "import": "./dist/relation-tree/index.js" + }, + "./request-status": { + "types": "./dist/request-status/index.d.ts", + "import": "./dist/request-status/index.js" + }, + "./rich-text-editor": { + "types": "./dist/rich-text-editor/index.d.ts", + "import": "./dist/rich-text-editor/index.js" + }, + "./rich-text-viewer": { + "types": "./dist/rich-text-viewer/index.d.ts", + "import": "./dist/rich-text-viewer/index.js" + }, + "./roll-location-center": { + "types": "./dist/roll-location-center/index.d.ts", + "import": "./dist/roll-location-center/index.js" + }, + "./roll-location-in-view": { + "types": "./dist/roll-location-in-view/index.d.ts", + "import": "./dist/roll-location-in-view/index.js" + }, + "./rule-describe": { + "types": "./dist/rule-describe/index.d.ts", + "import": "./dist/rule-describe/index.js" + }, + "./search-form": { + "types": "./dist/search-form/index.d.ts", + "import": "./dist/search-form/index.js" + }, + "./search-menu": { + "types": "./dist/search-menu/index.d.ts", + "import": "./dist/search-menu/index.js" + }, + "./selector-wrapper": { + "types": "./dist/selector-wrapper/index.d.ts", + "import": "./dist/selector-wrapper/index.js" + }, + "./selector-wrapper-search": { + "types": "./dist/selector-wrapper-search/index.d.ts", + "import": "./dist/selector-wrapper-search/index.js" + }, + "./selector-wrapper-simple": { + "types": "./dist/selector-wrapper-simple/index.d.ts", + "import": "./dist/selector-wrapper-simple/index.js" + }, + "./sms-count-down": { + "types": "./dist/sms-count-down/index.d.ts", + "import": "./dist/sms-count-down/index.js" + }, + "./styles": { + "types": "./dist/styles/index.d.ts", + "import": "./dist/styles/index.js" + }, + "./svg-http-view": { + "types": "./dist/svg-http-view/index.d.ts", + "import": "./dist/svg-http-view/index.js" + }, + "./switch-confirm-wrapper": { + "types": "./dist/switch-confirm-wrapper/index.d.ts", + "import": "./dist/switch-confirm-wrapper/index.js" + }, + "./switch-wrapper": { + "types": "./dist/switch-wrapper/index.d.ts", + "import": "./dist/switch-wrapper/index.js" + }, + "./table-cell-render": { + "types": "./dist/table-cell-render/index.d.ts", + "import": "./dist/table-cell-render/index.js" + }, + "./table-scrollbar": { + "types": "./dist/table-scrollbar/index.d.ts", + "import": "./dist/table-scrollbar/index.js" + }, + "./tabs-wrapper": { + "types": "./dist/tabs-wrapper/index.d.ts", + "import": "./dist/tabs-wrapper/index.js" + }, + "./tag-group": { + "types": "./dist/tag-group/index.d.ts", + "import": "./dist/tag-group/index.js" + }, + "./tag-list-render": { + "types": "./dist/tag-list-render/index.d.ts", + "import": "./dist/tag-list-render/index.js" + }, + "./tag-wrapper": { + "types": "./dist/tag-wrapper/index.d.ts", + "import": "./dist/tag-wrapper/index.js" + }, + "./text-overflow": { + "types": "./dist/text-overflow/index.d.ts", + "import": "./dist/text-overflow/index.js" + }, + "./text-symbol-wrapper": { + "types": "./dist/text-symbol-wrapper/index.d.ts", + "import": "./dist/text-symbol-wrapper/index.js" + }, + "./time-picker-wrapper": { + "types": "./dist/time-picker-wrapper/index.d.ts", + "import": "./dist/time-picker-wrapper/index.js" + }, + "./time-range-picker-wrapper": { + "types": "./dist/time-range-picker-wrapper/index.d.ts", + "import": "./dist/time-range-picker-wrapper/index.js" + }, + "./time-range-picker-wrapper-form-item": { + "types": "./dist/time-range-picker-wrapper-form-item/index.d.ts", + "import": "./dist/time-range-picker-wrapper-form-item/index.js" + }, + "./tips-title": { + "types": "./dist/tips-title/index.d.ts", + "import": "./dist/tips-title/index.js" + }, + "./tips-wrapper": { + "types": "./dist/tips-wrapper/index.d.ts", + "import": "./dist/tips-wrapper/index.js" + }, + "./tree-selector-wrapper": { + "types": "./dist/tree-selector-wrapper/index.d.ts", + "import": "./dist/tree-selector-wrapper/index.js" + }, + "./tree-wrapper": { + "types": "./dist/tree-wrapper/index.d.ts", + "import": "./dist/tree-wrapper/index.js" + }, + "./types": { + "types": "./dist/types/index.d.ts", + "import": "./dist/types/index.js" + }, + "./upload-wrapper": { + "types": "./dist/upload-wrapper/index.d.ts", + "import": "./dist/upload-wrapper/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/antd/src/button-wrapper/button-wrapper.tsx b/packages/antd/src/button-wrapper/button-wrapper.tsx index 3250d6e..fd41e64 100644 --- a/packages/antd/src/button-wrapper/button-wrapper.tsx +++ b/packages/antd/src/button-wrapper/button-wrapper.tsx @@ -11,7 +11,7 @@ import { fbaHooks } from '../fba-hooks/index.js'; import { fbaUtils } from '../fba-utils/fba-utils.js'; import './style.less'; -export type ButtonWrapperProps = Omit & { +export type ButtonWrapperProps = Omit & { /** 当返回 Promise 时，按钮自动loading */ onClick?: (e: React.MouseEvent) => Promise | void; /** 重复点击间隙，单位毫秒 默认值：500 */ @@ -24,6 +24,7 @@ export type ButtonWrapperProps = Omit & { loadingPosition?: 'left' | 'center'; /** 移除按钮内边距，一般用于 type=link 类型下 */ removeGap?: boolean; + color?: string; }; const DefaultButton = (props: { diff --git a/packages/antd/src/config-provider-wrapper/config-provider-wrapper.tsx b/packages/antd/src/config-provider-wrapper/config-provider-wrapper.tsx index 130700b..3aaadc0 100644 --- a/packages/antd/src/config-provider-wrapper/config-provider-wrapper.tsx +++ b/packages/antd/src/config-provider-wrapper/config-provider-wrapper.tsx @@ -13,8 +13,8 @@ import weekYear from 'dayjs/plugin/weekYear.js'; import { setFbaLocaleMessage } from '../_utils/i18n/index.js'; import { fbaHooks } from '../fba-hooks/index.js'; import { TFbaLocale, TLocale } from '../types/index.js'; -import 'dayjs/locale/en'; -import 'dayjs/locale/zh-cn'; +import 'dayjs/locale/en.js'; +import 'dayjs/locale/zh-cn.js'; dayjs.extend(customParseFormat); dayjs.extend(advancedFormat); dayjs.extend(weekday); diff --git a/packages/antd/src/date-picker-wrapper/date-picker-wrapper.tsx b/packages/antd/src/date-picker-wrapper/date-picker-wrapper.tsx index 731f1a6..f1fc67f 100644 --- a/packages/antd/src/date-picker-wrapper/date-picker-wrapper.tsx +++ b/packages/antd/src/date-picker-wrapper/date-picker-wrapper.tsx @@ -71,17 +71,19 @@ export const DatePickerWrapper = (props: DatePickerWrapperProps) => { return DayjsDateTypeEnum.YMD; }, [props.showTime, format]); - const onChangeDate = hooks.useCallbackRef((date, dateString: string) => { - if (date) { - if (outputNormalize) { - onChange?.(outputNormalize(dateString)); + const onChangeDate = hooks.useCallbackRef( + (date, dateString: string | string[]) => { + if (date) { + if (outputNormalize) { + onChange?.(outputNormalize(dateString)); + } else { + onChange?.(dateString as string); + } } else { - onChange?.(dateString); + onChange?.(undefined); } - } else { - onChange?.(undefined); } - }); + ); const getDisabledDate = hooks.useCallbackRef((current) => { const currentDate = current.format(DayjsDateTypeEnum.YMD); diff --git a/packages/antd/src/date-range-picker-wrapper/date-range-picker-wrapper.tsx b/packages/antd/src/date-range-picker-wrapper/date-range-picker-wrapper.tsx index 2ee7a71..67db755 100644 --- a/packages/antd/src/date-range-picker-wrapper/date-range-picker-wrapper.tsx +++ b/packages/antd/src/date-range-picker-wrapper/date-range-picker-wrapper.tsx @@ -1,6 +1,5 @@ import { useMemo, useState } from 'react'; -import { DatePicker } from 'antd'; -import { RangePickerDateProps } from 'antd/es/date-picker/generatePicker'; +import { DatePicker, GetProps } from 'antd'; import dayjs, { Dayjs } from 'dayjs'; import { flatbizDate, TAny } from '@hyperse/utils'; import { hooks } from '@wove/react'; @@ -11,8 +10,10 @@ import { getDisabledSecond, } from '../_utils/time.js'; +type RangePickerDateProps = GetProps; + export type DateRangePickerWrapperProps = Omit< - RangePickerDateProps, + RangePickerDateProps, 'value' | 'onChange' | 'onCalendarChange' | 'format' > & { value?: [string, string]; diff --git a/packages/antd/src/dropdown-menu-wrapper/dropdown-menu-wrapper.tsx b/packages/antd/src/dropdown-menu-wrapper/dropdown-menu-wrapper.tsx index 02b6f17..7ca81fb 100644 --- a/packages/antd/src/dropdown-menu-wrapper/dropdown-menu-wrapper.tsx +++ b/packages/antd/src/dropdown-menu-wrapper/dropdown-menu-wrapper.tsx @@ -1,6 +1,6 @@ import { Fragment, ReactElement, useMemo } from 'react'; import { ButtonProps, Dropdown, DropdownProps } from 'antd'; -import { ItemType } from 'antd/lib/menu/hooks/useItems.js'; +import { ItemType } from 'antd/es/menu/interface.js'; import { ExclamationCircleFilled } from '@ant-design/icons'; import { classNames } from '@dimjs/utils'; import { hooks } from '@wove/react'; @@ -12,7 +12,7 @@ import { FlexLayout } from '../flex-layout/flex-layout.js'; import { parentsHasSticky } from './utils.js'; import './style.less'; -export interface DropdownMenuItem extends ButtonProps { +export interface DropdownMenuItem extends Omit { text?: string | ReactElement; color?: string; onClick?: (event: React.MouseEvent) => void | Promise; diff --git a/packages/antd/src/rich-text-viewer/rich-text-viewer.tsx b/packages/antd/src/rich-text-viewer/rich-text-viewer.tsx index d13f15f..223d733 100644 --- a/packages/antd/src/rich-text-viewer/rich-text-viewer.tsx +++ b/packages/antd/src/rich-text-viewer/rich-text-viewer.tsx @@ -84,7 +84,6 @@ export const RichTextViewer = (props: RichTextViewerProps) => { menubar: false, toolbar: '', statusbar: false, - readonly: true, }} /> diff --git a/packages/antd/src/time-picker-wrapper/time-picker-wrapper.tsx b/packages/antd/src/time-picker-wrapper/time-picker-wrapper.tsx index 24b7a42..d398de5 100644 --- a/packages/antd/src/time-picker-wrapper/time-picker-wrapper.tsx +++ b/packages/antd/src/time-picker-wrapper/time-picker-wrapper.tsx @@ -61,13 +61,15 @@ export const TimePickerWrapper = (props: TimePickerWrapperProps) => { const customFormat = format || DayjsTimeTypeEnum.Hms; - const onChangeTime = hooks.useCallbackRef((time, timeString: string) => { - if (time) { - onChange?.(timeString); - } else { - onChange?.(undefined); + const onChangeTime = hooks.useCallbackRef( + (time, timeString: string | string[]) => { + if (time) { + onChange?.(timeString as string); + } else { + onChange?.(undefined); + } } - }); + ); const timePickerValue = useMemo(() => { const value = props.value; diff --git a/packages/pro-layout/package.json b/packages/pro-layout/package.json index f83015f..c8ab524 100644 --- a/packages/pro-layout/package.json +++ b/packages/pro-layout/package.json @@ -72,7 +72,9 @@ "antd": ">=5.11.0", "dayjs": ">=1.11.9", "react": ">=18.2.0", - "react-dom": ">=18.2.0" + "react-dom": ">=18.2.0", + "react-router": ">=6.8.1", + "react-router-dom": ">=6.8.1" }, "dependencies": { "@dnd-kit/core": "^6.1.0", @@ -83,8 +85,12 @@ "ace-builds": "^1.36.2", "dequal": "2.0.3", "pubsub-js": "1.9.4", + "react": "18.2.0", "react-ace": "^12.0.0", + "react-dom": "18.2.0", "react-is": "^18.3.1", + "react-router": "^6.8.1", + "react-router-dom": "^6.8.1", "react-split": "2.0.14", "simple-mind-map": "^0.12.0", "sql-formatter": "^15.4.4", diff --git a/packages/pro-layout/tsconfig.json b/packages/pro-layout/tsconfig.json index ef1fd9b..25943d5 100644 --- a/packages/pro-layout/tsconfig.json +++ b/packages/pro-layout/tsconfig.json @@ -8,7 +8,10 @@ "noEmit": false, "incremental": true, "paths": {}, - "types": ["vitest/globals", "node", "hammerjs"] + "types": ["vitest/globals", "node"], + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "Node" }, "exclude": ["**/node_modules", "**/.*/", "dist", "build"] } diff --git a/packages/utils/src/array/array-field-to-label-value.ts b/packages/utils/src/array/array-field-to-label-value.ts index 52803d4..63cdb20 100644 --- a/packages/utils/src/array/array-field-to-label-value.ts +++ b/packages/utils/src/array/array-field-to-label-value.ts @@ -1,6 +1,6 @@ import { extend } from '@dimjs/utils'; -import { isUndefinedOrNull } from '../lang'; -import { LabelValueItem, TPlainObject } from '../types'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; +import { LabelValueItem, TPlainObject } from '../types/index.js'; /** * 数组中的对象字段，转成label、value字段名对象，主要用于弹框中的数据源转换 diff --git a/packages/utils/src/array/array-filter.ts b/packages/utils/src/array/array-filter.ts index 916e4e8..1eb517d 100644 --- a/packages/utils/src/array/array-filter.ts +++ b/packages/utils/src/array/array-filter.ts @@ -1,4 +1,4 @@ -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * array.filter严谨查询，使用 === 进行比较 diff --git a/packages/utils/src/array/array-find-index.ts b/packages/utils/src/array/array-find-index.ts index c4f4a87..8d0ee30 100644 --- a/packages/utils/src/array/array-find-index.ts +++ b/packages/utils/src/array/array-find-index.ts @@ -1,4 +1,4 @@ -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * array.findIndex严谨查询，使用 === 进行比较 diff --git a/packages/utils/src/array/array-find.ts b/packages/utils/src/array/array-find.ts index 167ebda..0f6d270 100644 --- a/packages/utils/src/array/array-find.ts +++ b/packages/utils/src/array/array-find.ts @@ -1,4 +1,4 @@ -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * array.find严谨查询，使用 === 进行比较 diff --git a/packages/utils/src/array/array-max.ts b/packages/utils/src/array/array-max.ts index a9af41b..a24564f 100644 --- a/packages/utils/src/array/array-max.ts +++ b/packages/utils/src/array/array-max.ts @@ -1,5 +1,5 @@ import { isNumber, isPlainObject } from '@dimjs/lang'; -import { TPlainObject } from '../types'; +import { TPlainObject } from '../types/index.js'; /** * 数组中指定数值字段最大值 diff --git a/packages/utils/src/array/array-min.ts b/packages/utils/src/array/array-min.ts index df85a37..0d52405 100644 --- a/packages/utils/src/array/array-min.ts +++ b/packages/utils/src/array/array-min.ts @@ -1,5 +1,5 @@ import { isNumber, isPlainObject } from '@dimjs/lang'; -import { TPlainObject } from '../types'; +import { TPlainObject } from '../types/index.js'; /** * 数组中指定数值字段最小值 diff --git a/packages/utils/src/array/array-pick.ts b/packages/utils/src/array/array-pick.ts index e6fafcb..9160e8f 100644 --- a/packages/utils/src/array/array-pick.ts +++ b/packages/utils/src/array/array-pick.ts @@ -1,5 +1,5 @@ -import { TAny } from '../types'; -import { arrayFilter, arrayFilterByLoosely } from './array-filter'; +import { TAny } from '../types/index.js'; +import { arrayFilter, arrayFilterByLoosely } from './array-filter.js'; /** * 严谨查询，使用 === 进行比较 diff --git a/packages/utils/src/array/array-reorder.ts b/packages/utils/src/array/array-reorder.ts index bd3abea..516d4c3 100644 --- a/packages/utils/src/array/array-reorder.ts +++ b/packages/utils/src/array/array-reorder.ts @@ -1,5 +1,5 @@ import { arrayRemove } from '@dimjs/utils'; -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * 一维数组中两个元素交换位置 diff --git a/packages/utils/src/array/array-split.ts b/packages/utils/src/array/array-split.ts index b3ceb3f..2b62ee5 100644 --- a/packages/utils/src/array/array-split.ts +++ b/packages/utils/src/array/array-split.ts @@ -1,4 +1,4 @@ -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * 分割数组 diff --git a/packages/utils/src/array/array-total.ts b/packages/utils/src/array/array-total.ts index 6193acf..d505853 100644 --- a/packages/utils/src/array/array-total.ts +++ b/packages/utils/src/array/array-total.ts @@ -1,5 +1,5 @@ import { isNumber, isPlainObject } from '@dimjs/lang'; -import { TPlainObject } from '../types'; +import { TPlainObject } from '../types/index.js'; /** * 数组字段求和 diff --git a/packages/utils/src/array/index.ts b/packages/utils/src/array/index.ts index 02d231e..cec7a50 100644 --- a/packages/utils/src/array/index.ts +++ b/packages/utils/src/array/index.ts @@ -1,15 +1,15 @@ -export * from './array-field-to-label-value'; -export * from './array-filter'; -export * from './array-find'; -export * from './array-find-index'; -export * from './array-max'; -export * from './array-min'; -export * from './array-pick'; -export * from './array-reorder'; -export * from './array-split'; -export * from './array-total'; -export * from './generate-int-array'; -export * from './list-in-list'; -export * from './random-sort'; -export * from './to-array'; -export * from './two-array-element-change'; +export * from './array-field-to-label-value.js'; +export * from './array-filter.js'; +export * from './array-find.js'; +export * from './array-find-index.js'; +export * from './array-max.js'; +export * from './array-min.js'; +export * from './array-pick.js'; +export * from './array-reorder.js'; +export * from './array-split.js'; +export * from './array-total.js'; +export * from './generate-int-array.js'; +export * from './list-in-list.js'; +export * from './random-sort.js'; +export * from './to-array.js'; +export * from './two-array-element-change.js'; diff --git a/packages/utils/src/array/list-in-list.ts b/packages/utils/src/array/list-in-list.ts index 773e0c2..afef20a 100644 --- a/packages/utils/src/array/list-in-list.ts +++ b/packages/utils/src/array/list-in-list.ts @@ -1,5 +1,5 @@ -import { isUndefinedOrNull } from '../lang'; -import { TPlainObject } from '../types'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; +import { TPlainObject } from '../types/index.js'; /** * 通过规则字段 来源数组 并入 目标数组 diff --git a/packages/utils/src/array/to-array.ts b/packages/utils/src/array/to-array.ts index 787641e..0ae6d01 100644 --- a/packages/utils/src/array/to-array.ts +++ b/packages/utils/src/array/to-array.ts @@ -1,5 +1,5 @@ import { isArray } from '@dimjs/lang'; -import { isUndefinedOrNull } from '../lang'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; /** * 转数组 diff --git a/packages/utils/src/array/two-array-element-change.ts b/packages/utils/src/array/two-array-element-change.ts index f79ab5e..3df7337 100644 --- a/packages/utils/src/array/two-array-element-change.ts +++ b/packages/utils/src/array/two-array-element-change.ts @@ -1,4 +1,4 @@ -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * 两个数组中元素变换 diff --git a/packages/utils/src/date/compare.ts b/packages/utils/src/date/compare.ts index 5229695..d3ed28f 100644 --- a/packages/utils/src/date/compare.ts +++ b/packages/utils/src/date/compare.ts @@ -1,5 +1,5 @@ -import { dateNormalize } from './date-normalize'; -import { DateType } from './types'; +import { dateNormalize } from './date-normalize.js'; +import { DateType } from './types.js'; /** * 日期比较：大于等于 diff --git a/packages/utils/src/date/date-detail.ts b/packages/utils/src/date/date-detail.ts index 2090a60..1b11341 100644 --- a/packages/utils/src/date/date-detail.ts +++ b/packages/utils/src/date/date-detail.ts @@ -1,5 +1,5 @@ -import { dateNormalize } from './date-normalize'; -import { DateType } from './types'; +import { dateNormalize } from './date-normalize.js'; +import { DateType } from './types.js'; const weekConfig = { 1: '一', diff --git a/packages/utils/src/date/date-new.ts b/packages/utils/src/date/date-new.ts index d8e409d..dd5aee1 100644 --- a/packages/utils/src/date/date-new.ts +++ b/packages/utils/src/date/date-new.ts @@ -1,6 +1,6 @@ import { dateNew as dateNewFn } from '@dimjs/utils'; -import { dateNormalize } from './date-normalize'; -import { DateType } from './types'; +import { dateNormalize } from './date-normalize.js'; +import { DateType } from './types.js'; /** * 在日期【'y' | 'm' | 'd' | 'h' | 'mi' | 's'】中进行加减值处理 * @param dateInput diff --git a/packages/utils/src/date/date-normalize.ts b/packages/utils/src/date/date-normalize.ts index 5118f36..5b93128 100644 --- a/packages/utils/src/date/date-normalize.ts +++ b/packages/utils/src/date/date-normalize.ts @@ -1,5 +1,5 @@ import { dateNormalize as dateNormalizeFn } from '@dimjs/utils'; -import { DateType } from './types'; +import { DateType } from './types.js'; /** * 指定数据转日期格式 * @param dateInput diff --git a/packages/utils/src/date/format.ts b/packages/utils/src/date/format.ts index 998ce68..05a3965 100644 --- a/packages/utils/src/date/format.ts +++ b/packages/utils/src/date/format.ts @@ -1,7 +1,7 @@ import { dateFormat as dateFormatFn } from '@dimjs/utils'; -import { dateNormalize } from './date-normalize'; -import { isDate } from './is-date'; -import { DateFormatType, DateType } from './types'; +import { dateNormalize } from './date-normalize.js'; +import { isDate } from './is-date.js'; +import { DateFormatType, DateType } from './types.js'; export const dateFormat = ( dateInput: DateType, diff --git a/packages/utils/src/date/index.ts b/packages/utils/src/date/index.ts index 7f6aa89..cbd7aa8 100644 --- a/packages/utils/src/date/index.ts +++ b/packages/utils/src/date/index.ts @@ -1,11 +1,11 @@ -import { dateTimeEq, dateTimeGt, dateTimeGte, dateTimeIn } from './compare'; -import { dateDetail } from './date-detail'; -import { dateNew } from './date-new'; -import { dateNormalize } from './date-normalize'; -import { dateFormat } from './format'; -import { isDate } from './is-date'; +import { dateTimeEq, dateTimeGt, dateTimeGte, dateTimeIn } from './compare.js'; +import { dateDetail } from './date-detail.js'; +import { dateNew } from './date-new.js'; +import { dateNormalize } from './date-normalize.js'; +import { dateFormat } from './format.js'; +import { isDate } from './is-date.js'; -export * from './types'; +export * from './types.js'; type FlatbizDate = { /** diff --git a/packages/utils/src/date/is-date.ts b/packages/utils/src/date/is-date.ts index fbc51ed..548debe 100644 --- a/packages/utils/src/date/is-date.ts +++ b/packages/utils/src/date/is-date.ts @@ -1,5 +1,5 @@ -import { dateNormalize } from './date-normalize'; -import { DateType } from './types'; +import { dateNormalize } from './date-normalize.js'; +import { DateType } from './types.js'; /** * 判断日期是否合法 diff --git a/packages/utils/src/dom/index.ts b/packages/utils/src/dom/index.ts index 9e9c993..21609c5 100644 --- a/packages/utils/src/dom/index.ts +++ b/packages/utils/src/dom/index.ts @@ -1,6 +1,6 @@ -import { getUuid } from '../string/uuid'; -import { findParentsElement } from './find-parents-element'; -import { getScrollNode } from './get-scroll-node'; +import { getUuid } from '../string/uuid.js'; +import { findParentsElement } from './find-parents-element.js'; +import { getScrollNode } from './get-scroll-node.js'; export interface BodyAppendDivElementProps { divElement: HTMLDivElement; diff --git a/packages/utils/src/image/image-compress.ts b/packages/utils/src/image/image-compress.ts index 9e7c7de..f086021 100644 --- a/packages/utils/src/image/image-compress.ts +++ b/packages/utils/src/image/image-compress.ts @@ -1,7 +1,7 @@ import { extend } from '@dimjs/utils'; -import { TAny } from '../types'; -import { base64ToFile } from './base64-to-file'; -import { fileToBase64 } from './file-to-base64'; +import { TAny } from '../types/index.js'; +import { base64ToFile } from './base64-to-file.js'; +import { fileToBase64 } from './file-to-base64.js'; export type TImageCompressOptions = { /** 质量比例 0~1 */ diff --git a/packages/utils/src/image/index.ts b/packages/utils/src/image/index.ts index 5144f63..2aba193 100644 --- a/packages/utils/src/image/index.ts +++ b/packages/utils/src/image/index.ts @@ -1,3 +1,3 @@ -export * from './base64-to-file'; -export * from './file-to-base64'; -export * from './image-compress'; +export * from './base64-to-file.js'; +export * from './file-to-base64.js'; +export * from './image-compress.js'; diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 32434d8..be06bcd 100755 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,19 +1,19 @@ -export * from './array'; -export * from './date'; -export * from './dom'; -export * from './image'; -export * from './lang'; -export * from './noop'; -export * from './number'; -export * from './object'; -export * from './polyfill'; -export * from './price'; -export * from './props'; -export * from './sleep'; -export * from './string'; -export * from './system'; -export * from './table'; -export * from './tree'; -export * from './types'; -export * from './uri'; -export * from './validator'; +export * from './array/index.js'; +export * from './date/index.js'; +export * from './dom/index.js'; +export * from './image/index.js'; +export * from './lang/index.js'; +export * from './noop/index.js'; +export * from './number/index.js'; +export * from './object/index.js'; +export * from './polyfill/index.js'; +export * from './price/index.js'; +export * from './props/index.js'; +export * from './sleep/index.js'; +export * from './string/index.js'; +export * from './system/index.js'; +export * from './table/index.js'; +export * from './tree/index.js'; +export * from './types/index.js'; +export * from './uri/index.js'; +export * from './validator/index.js'; diff --git a/packages/utils/src/lang/index.ts b/packages/utils/src/lang/index.ts index ffc1cb2..df475d7 100644 --- a/packages/utils/src/lang/index.ts +++ b/packages/utils/src/lang/index.ts @@ -1 +1 @@ -export * from './is-empty'; +export * from './is-empty.js'; diff --git a/packages/utils/src/number/index.ts b/packages/utils/src/number/index.ts index 0fbd17b..ba96c2c 100644 --- a/packages/utils/src/number/index.ts +++ b/packages/utils/src/number/index.ts @@ -1 +1 @@ -export * from './is-number'; +export * from './is-number.js'; diff --git a/packages/utils/src/object/index.ts b/packages/utils/src/object/index.ts index 9e21743..25d131c 100644 --- a/packages/utils/src/object/index.ts +++ b/packages/utils/src/object/index.ts @@ -1,3 +1,3 @@ -export * from './enum-values'; -export * from './map-to-list'; -export * from './object-get-object'; +export * from './enum-values.js'; +export * from './map-to-list.js'; +export * from './object-get-object.js'; diff --git a/packages/utils/src/object/map-to-list.ts b/packages/utils/src/object/map-to-list.ts index 6a849bd..3eca402 100644 --- a/packages/utils/src/object/map-to-list.ts +++ b/packages/utils/src/object/map-to-list.ts @@ -1,4 +1,4 @@ -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; export type MapToListDefaultItem = { label: string; value: V }; diff --git a/packages/utils/src/object/object-get-object.ts b/packages/utils/src/object/object-get-object.ts index 9fcc39a..25e35c4 100644 --- a/packages/utils/src/object/object-get-object.ts +++ b/packages/utils/src/object/object-get-object.ts @@ -1,4 +1,4 @@ -import { TPlainObject } from '../types'; +import { TPlainObject } from '../types/index.js'; /** * 从对象数据中，根据规则筛选对象 diff --git a/packages/utils/src/polyfill/index.ts b/packages/utils/src/polyfill/index.ts index 0c14761..e3b5f94 100644 --- a/packages/utils/src/polyfill/index.ts +++ b/packages/utils/src/polyfill/index.ts @@ -1,5 +1,5 @@ -import './array-at'; -import './object-is'; +import './array-at.js'; +import './object-is.js'; export const polyfill = () => { console.log('@hyperse/utils polyfill'); diff --git a/packages/utils/src/price/fen2wan.ts b/packages/utils/src/price/fen2wan.ts index 0e18672..f08dbd8 100644 --- a/packages/utils/src/price/fen2wan.ts +++ b/packages/utils/src/price/fen2wan.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; /** * 金额转换 分 => 万元 diff --git a/packages/utils/src/price/fen2yuan.ts b/packages/utils/src/price/fen2yuan.ts index e406b41..c9de57f 100644 --- a/packages/utils/src/price/fen2yuan.ts +++ b/packages/utils/src/price/fen2yuan.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; /** * 金额转换 分 => 元 diff --git a/packages/utils/src/price/format.ts b/packages/utils/src/price/format.ts index 08d561d..a7de930 100644 --- a/packages/utils/src/price/format.ts +++ b/packages/utils/src/price/format.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; /** * 格式化金额保留小数点后2位 diff --git a/packages/utils/src/price/index.ts b/packages/utils/src/price/index.ts index 78592a2..600a8dc 100644 --- a/packages/utils/src/price/index.ts +++ b/packages/utils/src/price/index.ts @@ -1,11 +1,11 @@ -import { add, divide, multiply, subtract } from './calculate'; -import { priceFen2wan } from './fen2wan'; -import { priceFen2yuan } from './fen2yuan'; -import { priceFormat } from './format'; -import { priceRemoveTailZero } from './remove-zero'; -import { priceSplit } from './split'; -import { priceWan2fen } from './wan2fen'; -import { priceYuan2fen } from './yuan2fen'; +import { add, divide, multiply, subtract } from './calculate.js'; +import { priceFen2wan } from './fen2wan.js'; +import { priceFen2yuan } from './fen2yuan.js'; +import { priceFormat } from './format.js'; +import { priceRemoveTailZero } from './remove-zero.js'; +import { priceSplit } from './split.js'; +import { priceWan2fen } from './wan2fen.js'; +import { priceYuan2fen } from './yuan2fen.js'; type FlatbizPrice = { /** diff --git a/packages/utils/src/price/remove-zero.ts b/packages/utils/src/price/remove-zero.ts index bdf11ea..15a2b50 100644 --- a/packages/utils/src/price/remove-zero.ts +++ b/packages/utils/src/price/remove-zero.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; /** * 金额去除小数点尾号零（会四舍五入处理，默认添加分隔符） diff --git a/packages/utils/src/price/split.ts b/packages/utils/src/price/split.ts index 91b37d7..96d3cea 100644 --- a/packages/utils/src/price/split.ts +++ b/packages/utils/src/price/split.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; /** * 金额分割（会四舍五入处理，默认添加分隔符） diff --git a/packages/utils/src/price/wan2fen.ts b/packages/utils/src/price/wan2fen.ts index e7f9ad1..ca62fb4 100644 --- a/packages/utils/src/price/wan2fen.ts +++ b/packages/utils/src/price/wan2fen.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; export const priceWan2fen = ( amt?: string | number, diff --git a/packages/utils/src/price/yuan2fen.ts b/packages/utils/src/price/yuan2fen.ts index 17cccd9..b1dc02f 100644 --- a/packages/utils/src/price/yuan2fen.ts +++ b/packages/utils/src/price/yuan2fen.ts @@ -1,5 +1,5 @@ import { price } from '@dimjs/utils'; -import { isNumber } from '../number/is-number'; +import { isNumber } from '../number/is-number.js'; export const priceYuan2fen = ( amt?: string | number, diff --git a/packages/utils/src/props/compose-props.ts b/packages/utils/src/props/compose-props.ts index 58df5d4..b4894bf 100644 --- a/packages/utils/src/props/compose-props.ts +++ b/packages/utils/src/props/compose-props.ts @@ -1,5 +1,5 @@ import { isUndefined } from '@dimjs/lang'; -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; /** * 合并执行 originProps、patchProps中存在的相同命名函数， diff --git a/packages/utils/src/props/index.ts b/packages/utils/src/props/index.ts index 9ebbc3d..7383eb0 100644 --- a/packages/utils/src/props/index.ts +++ b/packages/utils/src/props/index.ts @@ -1,2 +1,2 @@ -export * from './attach-properties-to-component'; -export * from './compose-props'; +export * from './attach-properties-to-component.js'; +export * from './compose-props.js'; diff --git a/packages/utils/src/sentry/index.ts b/packages/utils/src/sentry/index.ts index 2bceb9a..2e05ffa 100644 --- a/packages/utils/src/sentry/index.ts +++ b/packages/utils/src/sentry/index.ts @@ -4,7 +4,7 @@ const Sentry = window['Sentry']; import { getQueryString, PlainObject } from '@dimjs/utils'; -import { TAny } from '../types'; +import { TAny } from '../types/index.js'; type SeverityLevel = 'fatal' | 'error' | 'warning' | 'log' | 'info' | 'debug'; diff --git a/packages/utils/src/string/cut-string.ts b/packages/utils/src/string/cut-string.ts index 6df793c..29571cd 100644 --- a/packages/utils/src/string/cut-string.ts +++ b/packages/utils/src/string/cut-string.ts @@ -1,4 +1,4 @@ -import { trim } from './trim'; +import { trim } from './trim.js'; /** * 获取字符串字节长度 diff --git a/packages/utils/src/string/format.ts b/packages/utils/src/string/format.ts index 9903440..93aaf92 100644 --- a/packages/utils/src/string/format.ts +++ b/packages/utils/src/string/format.ts @@ -1,5 +1,5 @@ import { isArray } from '@dimjs/lang'; -import { trim } from './trim'; +import { trim } from './trim.js'; /** * 字符串格式化 diff --git a/packages/utils/src/string/get-value-or-default.ts b/packages/utils/src/string/get-value-or-default.ts index e1b896e..87cb9c3 100644 --- a/packages/utils/src/string/get-value-or-default.ts +++ b/packages/utils/src/string/get-value-or-default.ts @@ -1,4 +1,4 @@ -import { isUndefinedOrNull } from '../lang'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; export const getValueOrDefault = ( value: string | number | null | undefined, diff --git a/packages/utils/src/string/index.ts b/packages/utils/src/string/index.ts index 0101217..a4be972 100644 --- a/packages/utils/src/string/index.ts +++ b/packages/utils/src/string/index.ts @@ -1,8 +1,8 @@ -export * from './cut-string'; -export * from './format'; -export * from './get-value-or-default'; -export * from './json-string'; -export * from './trim'; -export * from './uuid'; -export * from './value-is-equal'; -export * from './xml-validate'; +export * from './cut-string.js'; +export * from './format.js'; +export * from './get-value-or-default.js'; +export * from './json-string.js'; +export * from './trim.js'; +export * from './uuid.js'; +export * from './value-is-equal.js'; +export * from './xml-validate.js'; diff --git a/packages/utils/src/string/value-is-equal.ts b/packages/utils/src/string/value-is-equal.ts index 89c8cf7..e6a5d88 100644 --- a/packages/utils/src/string/value-is-equal.ts +++ b/packages/utils/src/string/value-is-equal.ts @@ -1,6 +1,6 @@ import { isArray } from '@dimjs/lang'; -import { isUndefinedOrNull } from '../lang'; -import { TAny } from '../types'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; +import { TAny } from '../types/index.js'; /** * 两个值比较，只用于string、number类型的值比较 diff --git a/packages/utils/src/system/index.ts b/packages/utils/src/system/index.ts index db4f85a..c6f6cde 100644 --- a/packages/utils/src/system/index.ts +++ b/packages/utils/src/system/index.ts @@ -1,4 +1,4 @@ -export * from './cache'; -export * from './env'; -export * from './webview'; -export * from './window'; +export * from './cache.js'; +export * from './env.js'; +export * from './webview.js'; +export * from './window.js'; diff --git a/packages/utils/src/system/window.ts b/packages/utils/src/system/window.ts index e29d483..65a5637 100644 --- a/packages/utils/src/system/window.ts +++ b/packages/utils/src/system/window.ts @@ -1,5 +1,5 @@ -import { getUuid } from '../string/uuid'; -import { TPlainObject } from '../types/define'; +import { getUuid } from '../string/uuid.js'; +import { TPlainObject } from '../types/define.js'; export const getGlobalData = () => { return (window['GLOBAL'] || {}) as T; diff --git a/packages/utils/src/table/index.ts b/packages/utils/src/table/index.ts new file mode 100644 index 0000000..f5d18c4 --- /dev/null +++ b/packages/utils/src/table/index.ts @@ -0,0 +1 @@ +export * from './merge-cell.js'; diff --git a/packages/utils/src/table/index.tsx b/packages/utils/src/table/index.tsx deleted file mode 100644 index 68c78ff..0000000 --- a/packages/utils/src/table/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from './merge-cell'; diff --git a/packages/utils/src/table/merge-cell.ts b/packages/utils/src/table/merge-cell.ts index 4bdc74e..29ca584 100644 --- a/packages/utils/src/table/merge-cell.ts +++ b/packages/utils/src/table/merge-cell.ts @@ -1,6 +1,6 @@ import { isArray } from '@dimjs/lang'; -import { valueIsEqual } from '../string'; -import { TAny, TPlainObject } from '../types'; +import { valueIsEqual } from '../string/value-is-equal.js'; +import { TAny, TPlainObject } from '../types/index.js'; /** * 表格合并单元格计算 diff --git a/packages/utils/src/tree/index.ts b/packages/utils/src/tree/index.ts index 121ace9..6e4de82 100644 --- a/packages/utils/src/tree/index.ts +++ b/packages/utils/src/tree/index.ts @@ -1,6 +1,6 @@ -export * from './tree-field-change'; -export * from './tree-filter'; -export * from './tree-item-detete'; -export * from './tree-leaf-parents-array'; -export * from './tree-to-array'; -export * from './tree-to-tiled-array'; +export * from './tree-field-change.js'; +export * from './tree-filter.js'; +export * from './tree-item-detete.js'; +export * from './tree-leaf-parents-array.js'; +export * from './tree-to-array.js'; +export * from './tree-to-tiled-array.js'; diff --git a/packages/utils/src/tree/tree-field-change.ts b/packages/utils/src/tree/tree-field-change.ts index 349b463..c21cd14 100644 --- a/packages/utils/src/tree/tree-field-change.ts +++ b/packages/utils/src/tree/tree-field-change.ts @@ -1,5 +1,5 @@ import { isArray } from '@dimjs/lang'; -import { TPlainObject } from '../types/define'; +import { TPlainObject } from '../types/define.js'; /** * 树结构数据，复制字段数据为新字段值（配置方式） diff --git a/packages/utils/src/tree/tree-filter.ts b/packages/utils/src/tree/tree-filter.ts index 7adc53f..624a617 100644 --- a/packages/utils/src/tree/tree-filter.ts +++ b/packages/utils/src/tree/tree-filter.ts @@ -1,7 +1,7 @@ import { isUndefined } from '@dimjs/lang'; -import { toArray } from '../array/to-array'; -import { TPlainObject } from '../types'; -import { treeToArray } from './tree-to-array'; +import { toArray } from '../array/to-array.js'; +import { TPlainObject } from '../types/index.js'; +import { treeToArray } from './tree-to-array.js'; const own = {}.hasOwnProperty; const treeFilterInner = ( diff --git a/packages/utils/src/tree/tree-item-detete.ts b/packages/utils/src/tree/tree-item-detete.ts index e60f68a..81928da 100644 --- a/packages/utils/src/tree/tree-item-detete.ts +++ b/packages/utils/src/tree/tree-item-detete.ts @@ -1,6 +1,6 @@ -import { TPlainObject } from '../types'; -import { treeFilter } from './tree-filter'; -import { treeToArray } from './tree-to-array'; +import { TPlainObject } from '../types/index.js'; +import { treeFilter } from './tree-filter.js'; +import { treeToArray } from './tree-to-array.js'; /** * 根据key值 删除 Tree数据节点以及所有子节点 diff --git a/packages/utils/src/tree/tree-leaf-parents-array.ts b/packages/utils/src/tree/tree-leaf-parents-array.ts index d6ca876..52a7b23 100644 --- a/packages/utils/src/tree/tree-leaf-parents-array.ts +++ b/packages/utils/src/tree/tree-leaf-parents-array.ts @@ -1,6 +1,6 @@ import { get } from '@dimjs/utils'; -import { isUndefinedOrNull } from '../lang'; -import { TPlainObject } from '../types'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; +import { TPlainObject } from '../types/index.js'; /** * 树叶子节点的所有父节点列表 diff --git a/packages/utils/src/tree/tree-to-array.ts b/packages/utils/src/tree/tree-to-array.ts index 9c4b458..924c190 100644 --- a/packages/utils/src/tree/tree-to-array.ts +++ b/packages/utils/src/tree/tree-to-array.ts @@ -1,4 +1,4 @@ -import { TPlainObject } from '../types/define'; +import { TPlainObject } from '../types/define.js'; /** * 树结构数据，由嵌套结构转成平铺结构，返回值不改变原数据命名 diff --git a/packages/utils/src/tree/tree-to-tiled-array.ts b/packages/utils/src/tree/tree-to-tiled-array.ts index b8e008e..e1221c5 100644 --- a/packages/utils/src/tree/tree-to-tiled-array.ts +++ b/packages/utils/src/tree/tree-to-tiled-array.ts @@ -1,6 +1,6 @@ import { extend } from '@dimjs/utils'; -import { TreeTiledDataItem } from '../types'; -import { TAny, TPlainObject } from '../types/define'; +import { TAny, TPlainObject } from '../types/define.js'; +import { TreeTiledDataItem } from '../types/index.js'; /** * 树结构数据，由嵌套结构转成平铺结构，返回数据格式根据fieldNames转换成 { value, label, parentValue } diff --git a/packages/utils/src/types/index.ts b/packages/utils/src/types/index.ts index 7edba75..d36f706 100644 --- a/packages/utils/src/types/index.ts +++ b/packages/utils/src/types/index.ts @@ -1,3 +1,3 @@ -export * from './common'; -export * from './define'; -export * from './tree'; +export * from './common.js'; +export * from './define.js'; +export * from './tree.js'; diff --git a/packages/utils/src/uri/get-module-url.ts b/packages/utils/src/uri/get-module-url.ts index 1a89ccc..e135123 100644 --- a/packages/utils/src/uri/get-module-url.ts +++ b/packages/utils/src/uri/get-module-url.ts @@ -1,7 +1,7 @@ -import { getGlobalData } from '../system/window'; -import { TPlainObject } from '../types/define'; -import { toLinkPath } from './to-link-path'; -import { urlJoin } from './url-join'; +import { getGlobalData } from '../system/window.js'; +import { TPlainObject } from '../types/define.js'; +import { toLinkPath } from './to-link-path.js'; +import { urlJoin } from './url-join.js'; /** * 获取指定项目模块地址 diff --git a/packages/utils/src/uri/index.ts b/packages/utils/src/uri/index.ts index c708115..730151d 100644 --- a/packages/utils/src/uri/index.ts +++ b/packages/utils/src/uri/index.ts @@ -1,10 +1,10 @@ -export * from './ensure-slash'; -export * from './get-module-url'; -export * from './is-http-url'; -export * from './path-compare'; -export * from './remove-slash'; -export * from './to-full-path'; -export * from './to-link-path'; -export * from './to-link-path-with-query'; -export * from './url-join'; -export * from './url-route'; +export * from './ensure-slash.js'; +export * from './get-module-url.js'; +export * from './is-http-url.js'; +export * from './path-compare.js'; +export * from './remove-slash.js'; +export * from './to-full-path.js'; +export * from './to-link-path.js'; +export * from './to-link-path-with-query.js'; +export * from './url-join.js'; +export * from './url-route.js'; diff --git a/packages/utils/src/uri/path-compare.ts b/packages/utils/src/uri/path-compare.ts index 8b54b53..578b786 100644 --- a/packages/utils/src/uri/path-compare.ts +++ b/packages/utils/src/uri/path-compare.ts @@ -1,4 +1,4 @@ -import { ensureSlash } from './ensure-slash'; +import { ensureSlash } from './ensure-slash.js'; /** * 比较两个path是否相等 diff --git a/packages/utils/src/uri/remove-slash.ts b/packages/utils/src/uri/remove-slash.ts index 62afa3e..2f14d6a 100644 --- a/packages/utils/src/uri/remove-slash.ts +++ b/packages/utils/src/uri/remove-slash.ts @@ -1,5 +1,5 @@ import { isString } from '@dimjs/lang'; -import { isUndefinedOrNull } from '../lang'; +import { isUndefinedOrNull } from '../lang/is-empty.js'; /** * 移除字符串前后斜线 diff --git a/packages/utils/src/uri/to-link-path-with-query.ts b/packages/utils/src/uri/to-link-path-with-query.ts index 15c4e77..1a734db 100644 --- a/packages/utils/src/uri/to-link-path-with-query.ts +++ b/packages/utils/src/uri/to-link-path-with-query.ts @@ -1,5 +1,5 @@ import { modifyQueryString, paramStrToJson } from '@dimjs/utils'; -import { TPlainObject } from '../types/define'; +import { TPlainObject } from '../types/define.js'; export const toLinkPathWithQuery = (path: string, query: TPlainObject = {}) => { return modifyQueryString( diff --git a/packages/utils/src/uri/to-link-path.ts b/packages/utils/src/uri/to-link-path.ts index 6ab043f..2625d79 100644 --- a/packages/utils/src/uri/to-link-path.ts +++ b/packages/utils/src/uri/to-link-path.ts @@ -1,7 +1,8 @@ import { isArray } from '@dimjs/lang'; import { getQueryString, modifyQueryString } from '@dimjs/utils'; -import { getWindow, isMockMeEnv } from '../system'; -import { TPlainObject } from '../types/define'; +import { isMockMeEnv } from '../system/env.js'; +import { getWindow } from '../system/window.js'; +import { TPlainObject } from '../types/define.js'; const userAgent = () => { return navigator.userAgent.toLowerCase(); diff --git a/packages/utils/src/uri/url-route.ts b/packages/utils/src/uri/url-route.ts index 1d63fd0..c891236 100644 --- a/packages/utils/src/uri/url-route.ts +++ b/packages/utils/src/uri/url-route.ts @@ -1,7 +1,7 @@ import { uriParse } from '@dimjs/utils'; -import { getGlobalData } from '../system'; -import { ensureSlash } from './ensure-slash'; -import { isHttpUri } from './is-http-url'; +import { getGlobalData } from '../system/window.js'; +import { ensureSlash } from './ensure-slash.js'; +import { isHttpUri } from './is-http-url.js'; export const getUrlRoute = (url: string) => { if (!isHttpUri(url)) return url; diff --git a/packages/utils/src/validator/index.ts b/packages/utils/src/validator/index.ts index 5411a2d..a652416 100644 --- a/packages/utils/src/validator/index.ts +++ b/packages/utils/src/validator/index.ts @@ -1,2 +1,2 @@ -export * from './is-18idcard'; -export * from './regexp'; +export * from './is-18idcard.js'; +export * from './regexp.js'; diff --git a/packages/utils/src/validator/is-18idcard.ts b/packages/utils/src/validator/is-18idcard.ts index 2d4fb9b..18f05d5 100644 --- a/packages/utils/src/validator/is-18idcard.ts +++ b/packages/utils/src/validator/is-18idcard.ts @@ -1,4 +1,4 @@ -import { dateFormat } from '../date/format'; +import { dateFormat } from '../date/format.js'; export const is18IdCard = (sId: string) => { if (!/^\d{17}(\d|X|x)$/.test(sId)) { diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 3800bdf..8f8b14f 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -8,7 +8,8 @@ "noEmit": false, "incremental": true, "paths": {}, - "types": ["vitest/globals", "node"] + "types": ["vitest/globals", "node"], + "target": "ESNext" }, "exclude": ["**/node_modules", "**/.*/", "dist", "build"] } diff --git a/yarn.lock b/yarn.lock index 71ad579..9acb6ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3523,6 +3523,8 @@ __metadata: react-ace: "npm:^12.0.0" react-dom: "npm:18.3.1" react-is: "npm:^18.3.1" + react-router: "npm:^6.8.1" + react-router-dom: "npm:^6.8.1" react-split: "npm:2.0.14" simple-mind-map: "npm:^0.12.0" sql-formatter: "npm:^15.4.4" @@ -3544,6 +3546,8 @@ __metadata: dayjs: ">=1.11.9" react: ">=18.2.0" react-dom: ">=18.2.0" + react-router: ">=6.8.1" + react-router-dom: ">=6.8.1" peerDependenciesMeta: react: optional: true @@ -4190,6 +4194,13 @@ __metadata: languageName: node linkType: hard +"@remix-run/router@npm:1.20.0": + version: 1.20.0 + resolution: "@remix-run/router@npm:1.20.0" + checksum: 10/e1d2420db94a1855b97f1784898d0ae389cf3b77129b8f419e51d4833b77ca2c92ac09e2cb558015324d64580a138fd6faa31e52fcc3ba90e3cc382a1a324d4a + languageName: node + linkType: hard + "@rollup/plugin-alias@npm:^5.1.1": version: 5.1.1 resolution: "@rollup/plugin-alias@npm:5.1.1" @@ -16203,6 +16214,30 @@ __metadata: languageName: node linkType: hard +"react-router-dom@npm:^6.8.1": + version: 6.27.0 + resolution: "react-router-dom@npm:6.27.0" + dependencies: + "@remix-run/router": "npm:1.20.0" + react-router: "npm:6.27.0" + peerDependencies: + react: ">=16.8" + react-dom: ">=16.8" + checksum: 10/cfbcbc1d387d3341a335e3a075e487cc09dcbb62f1b83bc827fc3eec937523d5647a2c4488c804dc61581e65561823d0166d17b5dbc8579998c25b5a0bcabad6 + languageName: node + linkType: hard + +"react-router@npm:6.27.0, react-router@npm:^6.8.1": + version: 6.27.0 + resolution: "react-router@npm:6.27.0" + dependencies: + "@remix-run/router": "npm:1.20.0" + peerDependencies: + react: ">=16.8" + checksum: 10/352e3af2075cdccf9d114b7e06d94a1b46a2147ba9d6e8643787a92464f5fd9ead950252a98d551f99f21860288bcf3a4f088cb5f46b28d1274a4e2ba24cc0f9 + languageName: node + linkType: hard + "react-split@npm:2.0.14": version: 2.0.14 resolution: "react-split@npm:2.0.14"