fix: 解决冲突

CHANGELOG.md

@@ -5,6 +5,18 @@ toc: false
 spline: explain
 ---
 
+## 🌈 1.1.1 `2024-03-21` 
+### 🚀 Features
+- `Guide`: 新增 `Guide` 组件 @Lyan-u ([#1243](https://github.com/Tencent/tdesign-mobile-vue/pull/1243))
+- `Locale`: 新增繁體中文语言包 @ssmyaojiayouya ([#1258](https://github.com/Tencent/tdesign-mobile-vue/pull/1258))
+- `Locale`: 新增韩语语言包 @ssmyaojiayouya ([#1262](https://github.com/Tencent/tdesign-mobile-vue/pull/1262))
+- `Locale`: 新增日语语言包 @ssmyaojiayouya ([#1261](https://github.com/Tencent/tdesign-mobile-vue/pull/1261))
+- `Locale`: 新增俄语语言包 @dexterBo ([#1257](https://github.com/Tencent/tdesign-mobile-vue/pull/1257))
+- `Locale`: 新增意大利语言包 @catiwang ([#1263](https://github.com/Tencent/tdesign-mobile-vue/pull/1263))
+### 🐞 Bug Fixes
+- `Dialog`: 修复 `zIndex` 属性无效的问题 @anlyyao ([#1267](https://github.com/Tencent/tdesign-mobile-vue/pull/1267))
+- `SwipeCell`: 修复左滑场景 `click` 事件无效 @XBIsland ([#1266](https://github.com/Tencent/tdesign-mobile-vue/pull/1266))
+
 ## 🌈 1.1.0 `2024-02-29` 
 ### 🚀 Features
 - `ConfigProvider`: 全局配置组件，支持组件国际化 @anlyyao ([#1240](https://github.com/Tencent/tdesign-mobile-vue/pull/1240))

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tdesign-mobile-vue",
   "purename": "tdesign",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "tdesign-mobile-vue",
   "author": "TDesign Group",
   "homepage": "https://tdesign.tencent.com/mobile-vue/",

site/docs/getting-started.en-US.md

@@ -5,14 +5,6 @@ spline: explain
 ---
 
 
-
-<div style="background: rgba(0, 168, 112, .1); display: flex; align-items: center; line-height: 20px; padding: 14px 24px; border-radius: 3px; color: #555a65">
-  <svg fill="none" viewBox="0 0 16 16" width="16px" height="16px" style="margin-right: 5px">
-    <path fill="#00a870" d="M8 15A7 7 0 108 1a7 7 0 000 14zM7.4 4h1.2v1.2H7.4V4zm.1 2.5h1V12h-1V6.5z" fillOpacity="0.9"></path>
-  </svg>
-  TDesign Mobile Vue is currently in the Beta stage, and it is undergoing rapid iteration, please pay attention to version changes.
-</div>
-
 ## Installation
 
 ### npm

site/docs/getting-started.md

@@ -5,14 +5,6 @@ spline: explain
 ---
 
 
-
-<div style="background: rgba(0, 168, 112, .1); display: flex; align-items: center; line-height: 20px; padding: 14px 24px; border-radius: 3px; color: #555a65">
-  <svg fill="none" viewBox="0 0 16 16" width="16px" height="16px" style="margin-right: 5px">
-    <path fill="#00a870" d="M8 15A7 7 0 108 1a7 7 0 000 14zM7.4 4h1.2v1.2H7.4V4zm.1 2.5h1V12h-1V6.5z" fillOpacity="0.9"></path>
-  </svg>
-  目前组件库处于 Beta 阶段，快速迭代中，请留意版本变化。
-</div>
-
 ## 安装
 
 ### 使用 npm 安装

src/action-sheet/index.ts

@@ -1,6 +1,6 @@
 import { createApp, DefineComponent, ref, h, VNode, App, nextTick } from 'vue';
 import ActionSheetVue from './action-sheet.vue';
-import { WithInstallType } from '../shared';
+import { WithInstallType, isBrowser } from '../shared';
 
 import './style';
 import { TdActionSheetProps } from './type';
@@ -12,6 +12,8 @@ let instance: any = null;
 let app: App<Element>;
 
 function create(props: Partial<TdActionSheetProps>): DefineComponent<TdActionSheetProps> {
+  if (!isBrowser) return;
+
   const root = document.createElement('div');
   document.body.appendChild(root);
 

src/back-top/back-top.vue

@@ -10,7 +10,7 @@ import { computed, defineComponent, getCurrentInstance, h } from 'vue';
 import { useElementBounding } from '@vueuse/core';
 import { BacktopIcon as TIconBackTop } from 'tdesign-icons-vue-next';
 
-import { renderTNode, TNode } from '../shared';
+import { renderTNode, TNode, isBrowser } from '../shared';
 import BackTopProps from './props';
 import config from '../config';
 
@@ -22,6 +22,7 @@ export default defineComponent({
   props: BackTopProps,
   setup(props, context) {
     const el = computed(() => {
+      if (!isBrowser) return undefined;
       return props.target ? props.target() : window.document.documentElement;
     });
     const { top } = useElementBounding(el);
@@ -43,8 +44,10 @@ export default defineComponent({
     });
 
     const clickBackBtn = () => {
-      window.document.documentElement.scrollTop += top.value;
-      props.onToTop?.();
+      if (isBrowser) {
+        window.document.documentElement.scrollTop += top.value;
+        props.onToTop?.();
+      }
     };
     return {
       name,

src/config-provider/context.ts

@@ -2,8 +2,8 @@ import { InjectionKey, ComputedRef } from 'vue';
 import _mergeWith from 'lodash/mergeWith';
 import merge from 'lodash/merge';
 import isArray from 'lodash/isArray';
-import defaultConfig from '../locale/default-config';
-import defaultZhLocale from '../locale/zh_CN';
+import defaultConfig from '../_common/js/global-config/mobile/default-config';
+import defaultZhLocale from '../_common/js/global-config/mobile/locale/zh_CN';
 import { GlobalConfigProvider } from './type';
 
 export const defaultGlobalConfig = merge(defaultConfig, defaultZhLocale);

src/dialog/index.ts

@@ -1,7 +1,7 @@
 import { createApp, h, App, ref, nextTick, reactive } from 'vue';
 
 import Dialog from './dialog.vue';
-import { WithInstallType } from '../shared';
+import { WithInstallType, isBrowser } from '../shared';
 import { DialogCloseContext, TdDialogProps, DialogInstance } from './type';
 
 import './style';
@@ -24,6 +24,8 @@ const propsFn = ['onConfirm', 'onCancel', 'onOverlayClick', 'onClose', 'onClosed
 type DialogPropsFnName = (typeof propsFn)[number];
 
 function create(options: Partial<TdDialogProps> | string): DialogInstance {
+  if (!isBrowser) return;
+
   const root = document.createElement('div');
   document.body.appendChild(root);
 

src/drawer/plugin.ts

@@ -1,11 +1,12 @@
 import { createApp, App, h, ref, nextTick } from 'vue';
 import vueDrawer from './drawer.vue';
-import { WithInstallType } from '../shared';
+import { WithInstallType, isBrowser } from '../shared';
 import { TdDrawerProps } from './type';
 
 type DrawerOptions = Omit<TdDrawerProps, 'attach'>;
 
 const Drawer = (options: DrawerOptions) => {
+  if (!isBrowser) return;
   const root = document.createElement('div');
   document.body.appendChild(root);
   const visible = ref(false);

src/image-viewer/image-viewer.vue

@@ -64,7 +64,7 @@ import { CloseIcon, DeleteIcon } from 'tdesign-icons-vue-next';
 
 import config from '../config';
 import ImagediverProps from './props';
-import { renderTNode, TNode, useDefault, inBrowser, useGesture, DragState, PinchState } from '../shared';
+import { renderTNode, TNode, useDefault, isBrowser, useGesture, DragState, PinchState } from '../shared';
 
 // inner components
 import { Swiper as TSwiper, SwiperItem as TSwiperItem } from '../swiper';
@@ -218,7 +218,7 @@ export default defineComponent({
     const checkTap = (e: DragState) => {
       const { event } = e;
       const deltaTime = Date.now() - dragStartTime;
-      if (deltaTime < TAP_TIME && inBrowser) {
+      if (deltaTime < TAP_TIME && isBrowser) {
         if (dblTapTimer) {
           clearTimeout(dblTapTimer);
           dblTapTimer = window.setTimeout(() => {

src/locale/ar_KW.ts

@@ -0,0 +1,3 @@
+import arKW from '../_common/js/global-config/mobile/locale/ar_KW';
+
+export default arKW;

src/locale/en_US.ts

@@ -1,89 +1,3 @@
-// 文件有效，为国际化做准备
-import 'dayjs/locale/en';
+import enUs from '../_common/js/global-config/mobile/locale/en_US';
 
-export default {
-  actionSheet: {
-    cancel: 'Cancel',
-  },
-  calendar: {
-    confirm: 'Confirm',
-    title: 'Select Date',
-    weekdays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-    monthTitle: '{month} {year}',
-    months: [
-      'January',
-      'February',
-      'March',
-      'April',
-      'May',
-      'June',
-      'July',
-      'August',
-      'September',
-      'October',
-      'November',
-      'December',
-    ],
-  },
-  cascader: {
-    title: 'Title',
-    placeholder: 'Select options',
-  },
-  dropdownMenu: {
-    reset: 'Reset',
-    confirm: 'Confirm',
-  },
-  dateTimePicker: {
-    title: 'Select Date',
-    cancel: 'Cancel',
-    confirm: 'Confirm',
-    format: 'YYYY-MM-DD',
-    yearLabel: 'Year',
-    monthLabel: 'Month',
-    dateLabel: 'Date',
-    hourLabel: 'Hour',
-    minuteLabel: 'Minute',
-    secondLabel: 'Second',
-  },
-  picker: {
-    cancel: 'Cancel',
-    confirm: 'Confirm',
-  },
-  pullDownRefresh: {
-    loadingTexts: ['Pull to refresh', 'Loose to refresh', 'Refreshing ', 'Refresh completed'],
-  },
-  rate: {
-    valueText: '{value} score',
-    noValueText: 'No score',
-  },
-  tabBar: {
-    newsAriaLabel: 'There is new news',
-    moreNewsAriaLabel: 'There is a lot of news',
-    haveMoreNewsAriaLabel: 'There are {value}+ news',
-    haveNewsAriaLabel: 'There are {value} news',
-  },
-  table: {
-    empty: 'Empty Data',
-  },
-  list: {
-    loading: 'Loading...',
-    loadingMoreText: 'Click to load more',
-    pulling: 'Pull to refresh...',
-    loosing: 'Loose to refresh...',
-    success: 'Refresh successful',
-  },
-  upload: {
-    progress: {
-      uploadingText: 'Uploading...',
-      waitingText: 'Waiting',
-      failText: 'Failed',
-      successText: 'Success',
-    },
-  },
-  guide: {
-    next: 'Next',
-    skip: 'Skip',
-    finish: 'Finish',
-    back: 'Back',
-  },
-};
+export default enUs;