refactor: move packages/components/_common to packages/common

.eslintignore

@@ -1,7 +1,6 @@
 snapshot*
 node_modules
-src/_common
-packages/components/_common
+packages/common
 script/test/cypress
 temp*
 

.github/workflows/pr-comment-ci.yml

@@ -127,8 +127,8 @@ jobs:
           fi
 
           if [ "$common_conflict" -eq "1" ];then
-              git checkout --ours src/_common
-              git add src/_common
+              git checkout --ours packages/common
+              git add packages/common
               echo "resolve conflict _common"
           fi
 
@@ -219,8 +219,8 @@ jobs:
           fi
 
           if [ "$common_conflict" -eq "1" ];then
-              git checkout --theirs src/_common
-              git add src/_common
+              git checkout --theirs packages/common
+              git add packages/common
               echo "resolve conflict _common"
           fi
 

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/_common"]
-	path = packages/components/_common
+[submodule "tdesign-common"]
+	path = packages/common
 	url = https://github.com/Tencent/tdesign-common.git

packages/components/affix/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/affix/_index.less';
+import '../../../common/style/web/components/affix/_index.less';

packages/components/alert/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/alert/_index.less';
+import '../../../common/style/web/components/alert/_index.less';

packages/components/anchor/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/anchor/_index.less';
+import '../../../common/style/web/components/anchor/_index.less';

packages/components/auto-complete/option-list.tsx

@@ -3,12 +3,12 @@ import { isFunction } from 'lodash-es';
 import HighlightOption from './highlight-option';
 import { CommonClassNameType } from '../hooks/useCommonClassName';
 import { AutoCompleteOptionObj, TdAutoCompleteProps } from './type';
-import log from '../_common/js/log';
+import log from '../../common/js/log';
 import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { on, off } from '../utils/dom';
 import { isString } from 'lodash-es';
 import { escapeRegExp } from 'lodash-es';
-import { ARROW_UP_REG, ARROW_DOWN_REG, ENTER_REG } from '../_common/js/common';
+import { ARROW_UP_REG, ARROW_DOWN_REG, ENTER_REG } from '../../common/js/common';
 
 export default defineComponent({
   name: 'AutoCompleteOptionList',

packages/components/auto-complete/style/index.js

@@ -1,2 +1,2 @@
-import '../../_common/style/web/components/select/_index.less';
-import '../../_common/style/web/components/auto-complete/_index.less';
+import '../../../common/style/web/components/select/_index.less';
+import '../../../common/style/web/components/auto-complete/_index.less';

packages/components/avatar/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/avatar/_index.less';
+import '../../../common/style/web/components/avatar/_index.less';

packages/components/back-top/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/back-top/_index.less';
+import '../../../common/style/web/components/back-top/_index.less';

packages/components/badge/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/badge/_index.less';
+import '../../../common/style/web/components/badge/_index.less';

packages/components/breadcrumb/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/breadcrumb/_index.less';
+import '../../../common/style/web/components/breadcrumb/_index.less';

packages/components/button/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/button/_index.less';
+import '../../../common/style/web/components/button/_index.less';

packages/components/calendar/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/calendar/_index.less';
+import '../../../common/style/web/components/calendar/_index.less';

packages/components/card/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/card/_index.less';
+import '../../../common/style/web/components/card/_index.less';

packages/components/cascader/hooks.ts

@@ -3,7 +3,7 @@ import { isEqual } from 'lodash-es';
 import { isFunction } from 'lodash-es';
 import { isString } from 'lodash-es';
 
-import TreeStore from '../_common/js/tree/tree-store';
+import TreeStore from '../../common/js/tree/tree-store';
 import { useDisabled } from '../hooks/useDisabled';
 import useVModel from '../hooks/useVModel';
 import useDefaultValue from '../hooks/useDefaultValue';

packages/components/cascader/interface.tsx

@@ -1,8 +1,8 @@
 import { TdCascaderProps, CascaderValue, CascaderChangeSource } from './type';
 import { TdSelectInputProps } from '../select-input/type';
-import TreeStore from '../_common/js/tree/tree-store';
-import TreeNode from '../_common/js/tree/tree-node';
-import { TreeNodeModel, TreeNodeValue } from '../_common/js/tree/types';
+import TreeStore from '../../common/js/tree/tree-store';
+import TreeNode from '../../common/js/tree/tree-node';
+import { TreeNodeModel, TreeNodeValue } from '../../common/js/tree/types';
 
 export * from './type';
 export interface CascaderContextType
@@ -34,9 +34,9 @@ export interface CascaderContextType
   setExpend: (val: TreeNodeValue[]) => void;
 }
 
-export { TreeNode } from '../_common/js/tree/tree-node';
-export type { TreeNodeValue } from '../_common/js/tree/types';
-export type { TreeOptionData } from '../_common/js/common';
+export { TreeNode } from '../../common/js/tree/tree-node';
+export type { TreeNodeValue } from '../../common/js/tree/types';
+export type { TreeOptionData } from '../../common/js/common';
 export type { TreeNodeModel } from '../tree';
 export type { TdSelectInputProps } from '../select-input/type';
 

packages/components/cascader/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/cascader/_index.less';
+import '../../../common/style/web/components/cascader/_index.less';

packages/components/checkbox/hooks/useCheckboxLazyLoad.ts

@@ -1,5 +1,5 @@
 import { onBeforeUnmount, onMounted, Ref, ref, watch } from 'vue';
-import observe from '../../_common/js/utils/observe';
+import observe from '../../../common/js/utils/observe';
 
 export function useCheckboxLazyLoad(labelRef: Ref<HTMLElement>, lazyLoad: Ref<boolean>) {
   const ioObserver = ref<IntersectionObserver>();

packages/components/checkbox/hooks/useKeyboardEvent.ts

@@ -1,4 +1,4 @@
-import { CHECKED_CODE_REG } from '../../_common/js/common';
+import { CHECKED_CODE_REG } from '../../../common/js/common';
 
 export function useKeyboardEvent(handleChange: (e: Event) => void) {
   const keyboardEventListener = (e: KeyboardEvent) => {

packages/components/checkbox/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/checkbox/_index.less';
+import '../../../common/style/web/components/checkbox/_index.less';

packages/components/collapse/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/collapse/_index.less';
+import '../../../common/style/web/components/collapse/_index.less';

packages/components/color-picker/panel/format/index.tsx

@@ -2,7 +2,7 @@ import { defineComponent, PropType, ref, watch } from 'vue';
 import { upperCase } from 'lodash-es';
 import { TdColorPickerProps } from '../../type';
 import props from '../../props';
-import { FORMATS } from '../../../_common/js/color-picker/constants';
+import { FORMATS } from '../../../../common/js/color-picker/constants';
 import { Color } from '../../utils';
 import { Select as TSelect, Option as TOption } from '../../../select';
 import FormatInputs from './inputs';

packages/components/color-picker/panel/header.tsx

@@ -1,7 +1,7 @@
 import { defineComponent, PropType, ref, watch } from 'vue';
 
 import props from '../props';
-import { COLOR_MODES } from '../../_common/js/color-picker/constants';
+import { COLOR_MODES } from '../../../common/js/color-picker/constants';
 import { RadioGroup as TRadioGroup, RadioButton as TRadioButton } from '../../radio';
 import { TdColorModes } from '../interfaces';
 import { useBaseClassName } from '../hooks';

packages/components/color-picker/panel/index.tsx

@@ -6,7 +6,7 @@ import {
   DEFAULT_LINEAR_GRADIENT,
   TD_COLOR_USED_COLORS_MAX_SIZE,
   DEFAULT_SYSTEM_SWATCH_COLORS,
-} from '../../_common/js/color-picker/constants';
+} from '../../../common/js/color-picker/constants';
 import PanelHeader from './header';
 import LinearGradient from './linear-gradient';
 import SaturationPanel from './saturation';

packages/components/color-picker/panel/linear-gradient.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
 import { cloneDeep } from 'lodash-es';
-import { GRADIENT_SLIDER_DEFAULT_WIDTH } from '../../_common/js/color-picker/constants';
+import { GRADIENT_SLIDER_DEFAULT_WIDTH } from '../../../common/js/color-picker/constants';
 import { genGradientPoint, gradientColors2string, GradientColorPoint } from '../utils';
 import { InputNumber as TInputNumber } from '../../input-number';
 import { useBaseClassName } from '../hooks';

packages/components/color-picker/panel/saturation.tsx

@@ -2,7 +2,7 @@ import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, reacti
 import {
   SATURATION_PANEL_DEFAULT_HEIGHT,
   SATURATION_PANEL_DEFAULT_WIDTH,
-} from '../../_common/js/color-picker/constants';
+} from '../../../common/js/color-picker/constants';
 import { Draggable, Coordinate } from '../utils';
 import { useBaseClassName } from '../hooks';
 import baseProps from './base-props';

packages/components/color-picker/panel/slider.tsx

@@ -1,5 +1,5 @@
 import { computed, defineComponent, onBeforeUnmount, onMounted, PropType, reactive, ref } from 'vue';
-import { SLIDER_DEFAULT_WIDTH } from '../../_common/js/color-picker/constants';
+import { SLIDER_DEFAULT_WIDTH } from '../../../common/js/color-picker/constants';
 import { Draggable, Coordinate } from '../utils';
 import { useBaseClassName } from '../hooks';
 import baseProps from './base-props';

packages/components/color-picker/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/color-picker/_index.less';
+import '../../../common/style/web/components/color-picker/_index.less';

packages/components/color-picker/utils/index.ts

@@ -1 +1 @@
-export * from '../../_common/js/color-picker';
+export * from '../../../common/js/color-picker';

packages/components/comment/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/comment/_index.less';
+import '../../../common/style/web/components/comment/_index.less';

packages/components/config-provider/context.ts

@@ -1,8 +1,8 @@
 import { InjectionKey, ComputedRef } from 'vue';
 import { mergeWith as _mergeWith } from 'lodash-es';
 import { merge } from 'lodash-es';
-import defaultConfig from '../_common/js/global-config/default-config';
-import defaultZhLocale from '../_common/js/global-config/locale/zh_CN';
+import defaultConfig from '../../common/js/global-config/default-config';
+import defaultZhLocale from '../../common/js/global-config/locale/zh_CN';
 import { GlobalConfigProvider } from './type';
 import { isArray } from 'lodash-es';
 

packages/components/date-picker/DatePicker.tsx

@@ -8,8 +8,8 @@ import { usePrefixClass, useConfig } from '../hooks/useConfig';
 import { useDisabled } from '../hooks/useDisabled';
 import { useGlobalIcon } from '../hooks/useGlobalIcon';
 import useSingle from './hooks/useSingle';
-import { parseToDayjs, getDefaultFormat, formatTime, formatDate } from '../_common/js/date-picker/format';
-import { subtractMonth, addMonth, extractTimeObj, covertToDate, isSame } from '../_common/js/date-picker/utils';
+import { parseToDayjs, getDefaultFormat, formatTime, formatDate } from '../../common/js/date-picker/format';
+import { subtractMonth, addMonth, extractTimeObj, covertToDate, isSame } from '../../common/js/date-picker/utils';
 import props from './props';
 import TSelectInput from '../select-input';
 import TSinglePanel from './panel/SinglePanel';

packages/components/date-picker/DatePickerPanel.tsx

@@ -2,8 +2,8 @@ import { defineComponent, computed } from 'vue';
 import dayjs from 'dayjs';
 import { isFunction } from 'lodash-es';
 import useSingleValue from './hooks/useSingleValue';
-import { formatDate, getDefaultFormat, parseToDayjs } from '../_common/js/date-picker/format';
-import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
+import { formatDate, getDefaultFormat, parseToDayjs } from '../../common/js/date-picker/format';
+import { subtractMonth, addMonth, extractTimeObj } from '../../common/js/date-picker/utils';
 import type {
   DateValue,
   TdDatePickerPanelProps,

packages/components/date-picker/DateRangePicker.tsx

@@ -18,8 +18,8 @@ import {
   isValidDate,
   getDefaultFormat,
   initYearMonthTime,
-} from '../_common/js/date-picker/format';
-import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
+} from '../../common/js/date-picker/format';
+import { subtractMonth, addMonth, extractTimeObj } from '../../common/js/date-picker/utils';
 import { dateCorrection } from './utils';
 import { useReadonly } from '../hooks/useReadonly';
 

packages/components/date-picker/DateRangePickerPanel.tsx

@@ -15,8 +15,8 @@ import {
 
 import TRangePanel from './panel/RangePanel';
 import useRangeValue from './hooks/useRangeValue';
-import { formatDate, getDefaultFormat, parseToDayjs } from '../_common/js/date-picker/format';
-import { subtractMonth, addMonth, extractTimeObj } from '../_common/js/date-picker/utils';
+import { formatDate, getDefaultFormat, parseToDayjs } from '../../common/js/date-picker/format';
+import { subtractMonth, addMonth, extractTimeObj } from '../../common/js/date-picker/utils';
 import { dateCorrection } from './utils';
 
 export default defineComponent({

packages/components/date-picker/base/Cell.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, computed } from 'vue';
 import { usePrefixClass } from '../../hooks/useConfig';
-import { extractTimeObj } from '../../_common/js/date-picker/utils';
+import { extractTimeObj } from '../../../common/js/date-picker/utils';
 import { Dayjs } from 'dayjs';
 
 export default defineComponent({

packages/components/date-picker/base/Table.tsx

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import isoWeek from 'dayjs/plugin/isoWeek';
 import TDatePickerCell from './Cell';
 import { useConfig, usePrefixClass } from '../../hooks/useConfig';
-import { parseToDayjs } from '../../_common/js/date-picker/format';
+import { parseToDayjs } from '../../../common/js/date-picker/format';
 import { isArray } from 'lodash-es';
 
 import type { TdDatePickerProps, DateMultipleValue } from '../type';

packages/components/date-picker/hooks/useRange.tsx

@@ -8,7 +8,7 @@ import { usePrefixClass, useConfig } from '../../hooks/useConfig';
 import { useReadonly } from '../../hooks/useReadonly';
 
 import { TdDateRangePickerProps, DateValue } from '../type';
-import { isValidDate, formatDate, getDefaultFormat, parseToDayjs } from '../../_common/js/date-picker/format';
+import { isValidDate, formatDate, getDefaultFormat, parseToDayjs } from '../../../common/js/date-picker/format';
 import useRangeValue from './useRangeValue';
 
 export const PARTIAL_MAP = { first: 'start', second: 'end' };

packages/components/date-picker/hooks/useRangeValue.ts

@@ -9,8 +9,8 @@ import {
   formatTime,
   getDefaultFormat,
   initYearMonthTime,
-} from '../../_common/js/date-picker/format';
-import { extractTimeFormat } from '../../_common/js/date-picker/utils';
+} from '../../../common/js/date-picker/format';
+import { extractTimeFormat } from '../../../common/js/date-picker/utils';
 
 export const PARTIAL_MAP = { first: 'start', second: 'end' };
 

packages/components/date-picker/hooks/useSingle.tsx

@@ -11,7 +11,7 @@ import {
   formatTime,
   getDefaultFormat,
   parseToDayjs,
-} from '../../_common/js/date-picker/format';
+} from '../../../common/js/date-picker/format';
 import useSingleValue from './useSingleValue';
 import { useReadonly } from '../../hooks/useReadonly';
 

packages/components/date-picker/hooks/useSingleValue.tsx

@@ -5,10 +5,10 @@ import {
   isValidDate,
   getDefaultFormat,
   parseToDayjs,
-} from '../../_common/js/date-picker/format';
+} from '../../../common/js/date-picker/format';
 import useVModel from '../../hooks/useVModel';
 import { TdDatePickerProps, DateMultipleValue, DateValue } from '../type';
-import { extractTimeFormat } from '../../_common/js/date-picker/utils';
+import { extractTimeFormat } from '../../../common/js/date-picker/utils';
 
 export default function useSingleValue(props: TdDatePickerProps) {
   const { value: valueFromProps, modelValue } = toRefs(props);

packages/components/date-picker/hooks/useTableData.tsx

@@ -1,6 +1,6 @@
 import { useConfig } from '../../hooks/useConfig';
 
-import { getWeeks, getYears, getMonths, getQuarters, flagActive } from '../../_common/js/date-picker/utils';
+import { getWeeks, getYears, getMonths, getQuarters, flagActive } from '../../../common/js/date-picker/utils';
 
 export default function useTableData(props: any) {
   // 国际化文本初始化

packages/components/date-picker/panel/PanelContent.tsx

@@ -5,7 +5,7 @@ import type { TdDatePickerProps } from '../type';
 import TDateHeader from '../base/Header';
 import TDateTable from '../base/Table';
 import TTimePickerPanel from '../../time-picker/panel/time-picker-panel';
-import { getDefaultFormat } from '../../_common/js/date-picker/format';
+import { getDefaultFormat } from '../../../common/js/date-picker/format';
 
 export default defineComponent({
   name: 'TPanelContent',

packages/components/date-picker/panel/RangePanel.tsx

@@ -3,7 +3,7 @@ import { useConfig, usePrefixClass } from '../../hooks/useConfig';
 import TPanelContent from './PanelContent';
 import TExtraContent from './ExtraContent';
 import { TdDateRangePickerProps } from '../type';
-import { getDefaultFormat, parseToDayjs } from '../../_common/js/date-picker/format';
+import { getDefaultFormat, parseToDayjs } from '../../../common/js/date-picker/format';
 import useTableData from '../hooks/useTableData';
 import useDisableDate from '../hooks/useDisableDate';
 

packages/components/date-picker/panel/SinglePanel.tsx

@@ -2,7 +2,7 @@ import { defineComponent, PropType, computed } from 'vue';
 import { useConfig, usePrefixClass } from '../../hooks/useConfig';
 import TPanelContent from './PanelContent';
 import TExtraContent from './ExtraContent';
-import { getDefaultFormat, parseToDayjs } from '../../_common/js/date-picker/format';
+import { getDefaultFormat, parseToDayjs } from '../../../common/js/date-picker/format';
 import useTableData from '../hooks/useTableData';
 import useDisableDate from '../hooks/useDisableDate';
 

packages/components/date-picker/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/date-picker/_index.less';
+import '../../../common/style/web/components/date-picker/_index.less';

packages/components/descriptions/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/descriptions/_index.less';
+import '../../../common/style/web/components/descriptions/_index.less';

packages/components/dialog/dialog.tsx

@@ -13,7 +13,7 @@ import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { useAction, useSameTarget } from './hooks';
 import { useTNodeJSX, useContent } from '../hooks/tnode';
 import useDestroyOnClose from '../hooks/useDestroyOnClose';
-import { getScrollbarWidth } from '../_common/js/utils/getScrollbarWidth';
+import { getScrollbarWidth } from '../../common/js/utils/getScrollbarWidth';
 
 import type { TdDialogProps } from './type';
 import useTeleport from '../hooks/useTeleport';

packages/components/dialog/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/dialog/_index.less';
+import '../../../common/style/web/components/dialog/_index.less';

packages/components/divider/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/divider/_index.less';
+import '../../../common/style/web/components/divider/_index.less';

packages/components/drawer/drawer.tsx

@@ -3,7 +3,7 @@ import { CloseIcon as TdCloseIcon } from 'tdesign-icons-vue-next';
 import { useConfig, usePrefixClass } from '../hooks/useConfig';
 import { useGlobalIcon } from '../hooks/useGlobalIcon';
 import { isServer } from '../utils/dom';
-import { getScrollbarWidth } from '../_common/js/utils/getScrollbarWidth';
+import { getScrollbarWidth } from '../../common/js/utils/getScrollbarWidth';
 import props from './props';
 import { DrawerCloseContext } from './type';
 import { useAction } from '../dialog/hooks';

packages/components/drawer/hooks.ts

@@ -1,6 +1,6 @@
 import { computed, ref } from 'vue';
 import { Styles } from '../common';
-import { getSizeDraggable, calcMoveSize } from '../_common/js/drawer/utils';
+import { getSizeDraggable, calcMoveSize } from '../../common/js/drawer/utils';
 import type { TdDrawerProps } from './type';
 
 export const useDrag = (props: TdDrawerProps) => {

packages/components/drawer/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/drawer/_index.less';
+import '../../../common/style/web/components/drawer/_index.less';

packages/components/dropdown/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/dropdown/_index.less';
+import '../../../common/style/web/components/dropdown/_index.less';

packages/components/empty/style/index.js

@@ -1 +1 @@
-import '../../_common/style/web/components/empty/_index.less';
+import '../../../common/style/web/components/empty/_index.less';