chore: release 1.6.7-naruto (#2818)

* fix(table): tree.defaultExpandAll (#2752) * Fix0817 (#2708) * fix: 弹窗组件如果初始默认显示，按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示，按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示，按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示，按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示，按esc关不掉问题修复 (#2608) * fix(checkbox): multitple checkbox-group exist at the page (#2768) * fix(checkbox): multitple checkboxgroup * fix(table): unique key * feat(table): fix resetValue does not work on clear filter; * fix(form): fix reset form error (#2760) Co-authored-by: zhangjiancheng <zhangjiancheng@aibaoxian.com> * feat(table): fix false value can not highlight filter icon; support filter.label (#2771) * fix(table): support filter value which is false can highlight filter icon * feat(table): support filter.label * docs(table): update demove * fix(table): title is a function * fix: lint error * fix(image): dulplicate preview icon (#2770) * fix(image): dulplicate preview icon * fix(image): fix preview url * fix(table): lint error * test: update snapshots * feat(dialog): confirmLoading (#2769) * feat(dialog): confirmLoading * test: update snapshots * fix(popup): clear queued open action caused by accident (#2747) * Revert "fix(popup): clear queued open action caused by accident (#2747)" (#2775) This reverts commit e1a1f95. * fix: fix bundle content (#2776) * fix: fix remove listener hook (#2777) * fix(loading): fix loading false create instance again (#2778) * fix(Select): fix delete exist option when delete input value (#2779) * feat: release 1.6.5 (#2774) * feat: release 1.6.5 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * fix(checkbox): group dynamic (#2793) * fix(table): multiple editable table (#2787) * fix(table): multiple editable table * docs(dialog): demo * chore: release 1.6.6 (#2795) * chore: 1.6.6 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat(treeselect): support panel content API (#2797) * fix: useResizeObserver (#2806) * chore: update README (#2808) * feat(table): support group columns (#2810) * feat(table): column controller * test(table): update snapshots * fix(table): props.locale * fix: lint error * fix: lint error * fix(dialog): Dialog component support confirmLoading (#2814) * fix(dialog): confirmLoading * docs(dialog): remove docs * feat(card): replace title span with div (#2812) * feat(card): replace title span with div * feat(card): replace title span with div * chore: release 1.6.7 (#2817) * chore: release 1.6.7 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * chore: release 1.6.7-naruto * chore: release 1.6.7-naruto --------- Co-authored-by: sheepluo <yaoyanhuoyi@qq.com> Co-authored-by: Zhanjiachun <49758402+Zhanjiachun@users.noreply.github.com> Co-authored-by: Zz-ZzzZ <48228016+Zz-ZzzZ@users.noreply.github.com> Co-authored-by: zhangjiancheng <zhangjiancheng@aibaoxian.com> Co-authored-by: ikeq <ikeq@foxmail.com> Co-authored-by: azhe <xiaosansiji@gmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Tencent · Sep 22, 2023 · 8abf8a2 · 8abf8a2
1 parent f838d61
commit 8abf8a2
Show file tree

Hide file tree

Showing 64 changed files with 1,968 additions and 1,048 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -74,6 +74,12 @@ npm package 中提供了多种构建产物，可以阅读 [这里](https://githu
 
 TDesign 欢迎任何愿意参与贡献的参与者。如果需要本地运行代码或参与贡献，请先阅读[参与贡献](https://github.com/Tencent/tdesign-vue/blob/develop/CONTRIBUTING.md)。
 
+# 反馈
+
+有任何问题，建议通过 [Github issues](https://github.com/Tencent/tdesign-vue/issues) 反馈或扫码加入用户微信群。
+
+<img src="https://oteam-tdesign-1258344706.cos.ap-guangzhou.myqcloud.com/site/doc/Vue2-IM.png" width="200" />
+
 # 开源协议
 
 TDesign 遵循 [MIT 协议](https://github.com/Tencent/tdesign-vue/blob/main/LICENSE)。
diff --git a/README.md b/README.md
@@ -76,6 +76,12 @@ TDesign also provides component libraries for other platforms and frameworks.
 
 Contributing is welcome. Read [guidelines for contributing](https://github.com/Tencent/tdesign-vue/blob/develop/CONTRIBUTING.md) before submitting your [Pull Request](https://github.com/Tencent/tdesign-vue/pulls).
 
+# Feedback
+
+Create your [Github issues](https://github.com/Tencent/tdesign-vue/issues) or scan the QR code below to join our user groups
+
+<img src="https://oteam-tdesign-1258344706.cos.ap-guangzhou.myqcloud.com/site/doc/Vue2-IM.png" width="200" />
+
 # License
 
 The MIT License. Please see [the license file](./LICENSE) for more information.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-vue",
   "purename": "tdesign",
-  "version": "1.6.4-naruto",
+  "version": "1.6.7-naruto",
   "description": "tdesign-vue",
   "title": "tdesign-vue",
   "keywords": [

diff --git a/script/rollup.config.js b/script/rollup.config.js
@@ -139,7 +139,7 @@ const esConfig = {
   // 为了保留 style/css.js
   treeshake: false,
   external: externalDeps.concat(externalPeerDeps),
-  plugins: [multiInput()].concat(getPlugins({ extractMultiCss: true })),
+  plugins: [multiInput()].concat(getPlugins({ env: 'production', extractMultiCss: true })),
   output: {
     banner,
     dir: 'es/',
@@ -155,7 +155,7 @@ const esmConfig = {
   // 为了保留 style/index.js
   treeshake: false,
   external: externalDeps.concat(externalPeerDeps),
-  plugins: [multiInput()].concat(getPlugins({ ignoreLess: false })),
+  plugins: [multiInput()].concat(getPlugins({ env: 'production', ignoreLess: false })),
   output: {
     banner,
     dir: 'esm/',
@@ -169,7 +169,7 @@ const esmConfig = {
 const libConfig = {
   input: inputList.concat('!src/index-lib.ts'),
   external: externalDeps.concat(externalPeerDeps),
-  plugins: [multiInput()].concat(getPlugins()),
+  plugins: [multiInput()].concat(getPlugins({ env: 'production' })),
   output: {
     banner,
     dir: 'lib/',
@@ -183,7 +183,7 @@ const libConfig = {
 const cjsConfig = {
   input: inputList,
   external: externalDeps.concat(externalPeerDeps),
-  plugins: [multiInput()].concat(getPlugins()),
+  plugins: [multiInput()].concat(getPlugins({ env: 'production' })),
   output: {
     banner,
     dir: 'cjs/',

diff --git a/src/_common b/src/_common
diff --git a/src/auto-complete/option-list.tsx b/src/auto-complete/option-list.tsx
@@ -1,5 +1,5 @@
 import {
-  ref, computed, defineComponent, PropType, h, watch, onBeforeMount,
+  ref, computed, defineComponent, PropType, h, watch, onBeforeUnmount,
 } from 'vue';
 import isFunction from 'lodash/isFunction';
 import HighlightOption from './highlight-option';
@@ -123,7 +123,7 @@ export default defineComponent({
       { immediate: true },
     );
 
-    onBeforeMount(() => {
+    onBeforeUnmount(() => {
       removeKeyboardListener();
     });
 

diff --git a/src/card/card.tsx b/src/card/card.tsx
@@ -124,8 +124,8 @@ export default defineComponent({
           <div class={this.headerWrapperCls}>
             {this.showAvatar && <div class={this.headerAvatarCls}>{renderTNodeJSX(this, 'avatar')}</div>}
             <div>
-              {this.showTitle && <span class={this.headerTitleCls}>{renderTNodeJSX(this, 'title')}</span>}
-              {this.showSubtitle && <span class={this.headerSubTitleCls}>{renderTNodeJSX(this, 'subtitle')}</span>}
+              {this.showTitle && <div class={this.headerTitleCls}>{renderTNodeJSX(this, 'title')}</div>}
+              {this.showSubtitle && <div class={this.headerSubTitleCls}>{renderTNodeJSX(this, 'subtitle')}</div>}
               {this.showDescription && <p class={this.headerDescriptionCls}>{renderTNodeJSX(this, 'description')}</p>}
             </div>
           </div>

diff --git a/src/checkbox/_example/controlled.vue b/src/checkbox/_example/controlled.vue
@@ -7,7 +7,7 @@
       <t-checkbox :defaultChecked="false" :onChange="onChange2">非受控属性</t-checkbox>
     </t-space>
     <!-- 复选框框组受控模式 -->
-    <t-checkbox-group :value="checked2" :options="options" :onChange="onChange2" />
+    <t-checkbox-group :value="checked2" :options="options" :onChange="onChange5" />
   </t-space>
 </template>
 
@@ -32,6 +32,10 @@ export default {
     onChange2(value, context) {
       console.log('change: ', value, context);
     },
+    onChange5(value, context) {
+      this.checked2 = value;
+      console.log('change: ', value, context);
+    },
   },
 };
 </script>

diff --git a/src/checkbox/checkbox.tsx b/src/checkbox/checkbox.tsx
@@ -1,5 +1,5 @@
 import {
-  defineComponent, ref, toRefs, inject, watch, onBeforeUnmount,
+  defineComponent, ref, toRefs, inject, watch, onBeforeUnmount, computed,
 } from 'vue';
 import props from './props';
 import {
@@ -31,7 +31,8 @@ export default defineComponent({
   },
 
   setup(props) {
-    const checkboxStore = getCheckboxStore(props.storeKey);
+    const { storeKey } = toRefs(props);
+    const checkboxStore = computed(() => getCheckboxStore(storeKey.value));
     const labelRef = ref<HTMLElement>();
     const { STATUS } = useCommonClassName();
     const checkboxGroupExist = ref(false);
@@ -64,27 +65,27 @@ export default defineComponent({
       } else {
         tChecked.value = parentChecked.includes(value);
       }
-      checkboxGroupExist.value = checkboxStore.parentExist;
+      checkboxGroupExist.value = checkboxStore.value.parentExist;
     };
 
     watch(
-      [innerChecked],
+      [innerChecked, checkboxStore],
       () => {
         // CheckboxGroup does not exist, self checked works
-        if (!checkboxStore.parentExist) {
-          tChecked.value = innerChecked.value;
-        } else {
+        if (checkboxStore.value?.parentExist) {
           checkboxGroupExist.value = true;
+        } else {
+          tChecked.value = innerChecked.value;
         }
       },
       { immediate: true },
     );
 
     watch(
-      [indeterminate],
-      ([val]) => {
+      [indeterminate, checkboxStore],
+      ([val, checkboxStore]) => {
         // CheckboxGroup does not exist, self indeterminate works
-        if (!checkboxStore.parentExist) {
+        if (!checkboxStore?.parentExist) {
           tIndeterminate.value = val;
         }
       },
@@ -113,9 +114,9 @@ export default defineComponent({
     };
 
     watch(
-      [disabled],
+      [disabled, checkboxStore],
       ([val]) => {
-        if (!checkboxStore.parentExist) {
+        if (!checkboxStore.value?.parentExist) {
           tDisabled.value = val;
         }
       },
@@ -140,7 +141,7 @@ export default defineComponent({
     );
 
     const subscribeParentData = (val: string | number | boolean) => {
-      checkboxStore.subscribe(val, (data: ObserverListenerParams) => {
+      checkboxStore.value.subscribe(val, (data: ObserverListenerParams) => {
         if (data.type === 'checked') {
           handleParentCheckedChange(data);
         } else if (data.type === 'checkbox') {
@@ -152,14 +153,17 @@ export default defineComponent({
       });
     };
 
-    subscribeParentData(props.checkAll ? 'CHECK_ALL' : value.value);
-
-    watch([data, label], () => {
-      subscribeParentData(props.checkAll ? 'CHECK_ALL' : value.value);
-    });
+    watch(
+      [data, label, storeKey],
+      () => {
+        if (!storeKey.value) return;
+        subscribeParentData(props.checkAll ? 'CHECK_ALL' : value.value);
+      },
+      { immediate: true },
+    );
 
     onBeforeUnmount(() => {
-      checkboxStore.unSubscribe(props.checkAll ? 'CHECK_ALL' : value.value);
+      checkboxStore.value?.unSubscribe(props.checkAll ? 'CHECK_ALL' : value.value);
     });
 
     const handleChange = (e: Event) => {

diff --git a/src/checkbox/group.tsx b/src/checkbox/group.tsx
@@ -9,7 +9,7 @@ import props from './checkbox-group-props';
 import { CheckboxOptionObj, TdCheckboxProps, CheckboxGroupValue } from './type';
 import { CheckboxGroupInjectionKey } from './constants';
 import { usePrefixClass, useVModel, useChildComponentSlots } from '../hooks';
-import { getCheckboxStore } from './store';
+import { createCheckboxStore } from './store';
 
 export default defineComponent({
   name: 'TCheckboxGroup',
@@ -19,15 +19,8 @@ export default defineComponent({
   setup(props) {
     /** 样式 */
     const COMPONENT_NAME = usePrefixClass('checkbox-group');
-    const date = new Date();
-    const storeKey = [
-      date.getDate(),
-      date.getHours(),
-      date.getMinutes(),
-      date.getSeconds(),
-      date.getUTCMilliseconds(),
-    ].join('_');
-    const checkboxStore = getCheckboxStore(storeKey);
+
+    const { checkboxStore, storeKey } = createCheckboxStore();
     checkboxStore.init();
 
     const { isArray } = Array;
@@ -181,10 +174,12 @@ export default defineComponent({
     );
 
     watch([isCheckAll, indeterminate, options], ([isCheckAll, indeterminate]) => {
-      checkboxStore.updateChecked({
-        checked: innerValue.value,
-        isCheckAll,
-        indeterminate,
+      nextTick(() => {
+        checkboxStore.updateChecked({
+          checked: innerValue.value,
+          isCheckAll,
+          indeterminate,
+        });
       });
     });
 

diff --git a/src/checkbox/store.ts b/src/checkbox/store.ts
@@ -109,9 +109,29 @@ export function getChangedChecked(
 
 const checkboxStoreInstanceMap: { [key: string]: CheckboxStore } = {};
 
-export function getCheckboxStore(key: string) {
-  if (!checkboxStoreInstanceMap[key]) {
-    checkboxStoreInstanceMap[key] = new CheckboxStore();
+export function createCheckboxStore(key?: string): { storeKey: string; checkboxStore: CheckboxStore } {
+  const date = new Date();
+  const storeKey = key
+    || [
+      date.getDate(),
+      date.getHours(),
+      date.getMinutes(),
+      date.getSeconds(),
+      date.getUTCMilliseconds(),
+      Number((Math.random() * 10000).toFixed(2)),
+    ].join('_');
+
+  if (checkboxStoreInstanceMap[storeKey]) {
+    return createCheckboxStore();
   }
+  checkboxStoreInstanceMap[storeKey] = new CheckboxStore();
+
+  return {
+    storeKey,
+    checkboxStore: checkboxStoreInstanceMap[storeKey],
+  };
+}
+
+export function getCheckboxStore(key: string) {
   return checkboxStoreInstanceMap[key];
 }
diff --git a/src/config-provider/useConfig.tsx b/src/config-provider/useConfig.tsx
@@ -1,4 +1,6 @@
-import { inject, h, ref } from 'vue';
+import {
+  inject, h, ref, computed,
+} from 'vue';
 import { GlobalConfigProvider, defaultGlobalConfig } from './context';
 
 // 处理正则表达式
@@ -29,11 +31,15 @@ const t = function <T> (pattern: T, ...args: any[]) {
  * @returns {t, global}
  * useConfig('pagination')
  */
-export function useConfig<T extends keyof GlobalConfigProvider>(componentName?: T) {
+export function useConfig<T extends keyof GlobalConfigProvider>(
+  componentName: T = undefined,
+  componentLocale?: GlobalConfigProvider[T],
+) {
   const injectGlobalConfig = inject<GlobalConfigProvider>('globalConfig', null);
   const mergedGlobalConfig = injectGlobalConfig || defaultGlobalConfig;
 
-  const global = ref(mergedGlobalConfig[componentName]);
+  // eslint-disable-next-line
+  const global = computed(() => Object.assign({}, mergedGlobalConfig[componentName], componentLocale));
   const classPrefix = ref(mergedGlobalConfig.classPrefix);
 
   return {

diff --git a/src/dialog/_example/async.vue b/src/dialog/_example/async.vue
@@ -1,14 +1,17 @@
 <template>
   <div>
-    <t-button @click="visible = true">异步加载类按钮</t-button>
+    <t-space>
+      <t-button @click="visible = true">异步加载类按钮</t-button>
+      <t-button @click="openAnotherDialog">插件函数异步加载</t-button>
+    </t-space>
     <t-dialog
       :visible.sync="visible"
       header="保存"
       body="保存中，请稍后"
       :confirmBtn="{
-        content: '保存中...',
+        content: '保存',
         theme: 'primary',
-        loading: true,
+        loading,
       }"
       :onConfirm="onConfirm"
       :onClose="close"
@@ -20,15 +23,45 @@ export default {
   data() {
     return {
       visible: false,
+      loading: false,
     };
   },
   methods: {
     close() {
       this.visible = false;
     },
     onConfirm() {
-      console.log('处理中...');
-      this.visible = false;
+      this.loading = true;
+      const timer = setTimeout(() => {
+        this.loading = false;
+        this.visible = false;
+        clearTimeout(timer);
+      }, 500);
+    },
+
+    openAnotherDialog() {
+      const confirmDialog = this.$dialog.confirm({
+        header: '提交后不可再编辑会进入审批流程',
+        body: '是否确认提交？',
+        confirmBtn: {
+          content: '提交',
+          theme: 'primary',
+          loading: false,
+        },
+        theme: 'warning',
+        onConfirm: () => {
+          confirmDialog.update({ confirmBtn: { content: '提交中', loading: true } });
+          // confirmDialog.update({ confirmLoading: true });
+          // confirmDialog.setConfirmLoading(true);
+          const timer = setTimeout(() => {
+            confirmDialog.update({ confirmBtn: { content: '提交', loading: false } });
+            // confirmDialog.update({ confirmLoading: false });
+            // confirmDialog.setConfirmLoading(false);
+            confirmDialog.hide();
+            clearTimeout(timer);
+          }, 500);
+        },
+      });
     },
   },
 };